jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r1765201 - in /jackrabbit/commons/filevault/trunk: vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/ vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/ vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/
Date Mon, 17 Oct 2016 01:52:05 GMT
Author: tripod
Date: Mon Oct 17 01:52:05 2016
New Revision: 1765201

URL: http://svn.apache.org/viewvc?rev=1765201&view=rev
Log:
JCRVLT-133 Avoid node.refresh()

Modified:
    jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdRefresh.java
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java

Modified: jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdRefresh.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdRefresh.java?rev=1765201&r1=1765200&r2=1765201&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdRefresh.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdRefresh.java
Mon Oct 17 01:52:05 2016
@@ -47,7 +47,7 @@ public class CmdRefresh extends Abstract
         if (wo instanceof RepositoryCFile) {
             Node node = (Node) wo.unwrap();
             try {
-                node.refresh(cl.hasOption(optKeepChanges));
+                node.getSession().refresh(cl.hasOption(optKeepChanges));
                 System.out.println("Modifications refreshed.");
             } catch (RepositoryException e) {
                 throw new ExecutionException("Error while refreshing: " + e);

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java?rev=1765201&r1=1765200&r2=1765201&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
Mon Oct 17 01:52:05 2016
@@ -278,7 +278,7 @@ public class FileArtifactHandler extends
         if (exists) {
             fileNode = parent.getNode(name);
             if (!fileNode.isNodeType(JcrConstants.NT_FILE)) {
-                parent.refresh(false);
+                parent.getSession().refresh(false);
                 throw new IOException("Incompatible content. Expected a nt:file but was "
+ fileNode.getPrimaryNodeType().getName());
             }
             contentNode = fileNode.getNode(JcrConstants.JCR_CONTENT);

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java?rev=1765201&r1=1765200&r2=1765201&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
Mon Oct 17 01:52:05 2016
@@ -944,7 +944,7 @@ public class JcrPackageDefinitionImpl im
             } finally {
                 try {
                     // revert removed properties
-                    defNode.refresh(false);
+                    defNode.getSession().refresh(false);
                 } catch (RepositoryException e) {
                     // ignore
                 }



Mime
View raw message