You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/06/13 16:08:52 UTC
svn commit: r1602435 - in /sling/trunk/contrib/extensions/replication/core:
pom.xml
src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java
Author: tommaso
Date: Fri Jun 13 14:08:52 2014
New Revision: 1602435
URL: http://svn.apache.org/r1602435
Log:
SLING-3668 - fixed possible NPE, bumped httpclient to latest
Modified:
sling/trunk/contrib/extensions/replication/core/pom.xml
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java
Modified: sling/trunk/contrib/extensions/replication/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/pom.xml?rev=1602435&r1=1602434&r2=1602435&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/core/pom.xml Fri Jun 13 14:08:52 2014
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.3.2</version>
+ <version>4.3.4</version>
</dependency>
<!-- JACKRABBIT -->
<dependency>
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java?rev=1602435&r1=1602434&r2=1602435&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java Fri Jun 13 14:08:52 2014
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.serialization.ReplicationPackage;
@@ -53,7 +52,7 @@ public class FileVaultReplicationPackage
paths[i] = filterSets.get(i).getRoot();
}
this.paths = paths;
- this.id = pkg.getFile().getAbsolutePath();
+ this.id = pkg.getFile() != null ? pkg.getFile().getAbsolutePath() : String.valueOf(pkg.getId());
this.action = ReplicationActionType.ADD.toString();
}