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 2016/11/24 15:23:44 UTC
svn commit: r1771164 - in
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl:
FileDistributionPackageBuilder.java ResourceDistributionPackage.java
Author: tommaso
Date: Thu Nov 24 15:23:44 2016
New Revision: 1771164
URL: http://svn.apache.org/viewvc?rev=1771164&view=rev
Log:
SLING-6324 - added randomization to package ids, patch from Simone Tripodi
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java?rev=1771164&r1=1771163&r2=1771164&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java Thu Nov 24 15:23:44 2016
@@ -19,6 +19,8 @@
package org.apache.sling.distribution.packaging.impl;
+import static java.util.UUID.randomUUID;
+
import javax.annotation.Nonnull;
import java.io.File;
import java.io.FileOutputStream;
@@ -81,7 +83,7 @@ public class FileDistributionPackageBuil
final File file;
try {
- file = File.createTempFile("distrpck-create-" + System.nanoTime(), "." + getType(), tempDirectory);
+ file = File.createTempFile("distrpck-create-" + randomUUID(), "." + getType(), tempDirectory);
if (digestAlgorithm != null) {
outputStream = openDigestOutputStream(new FileOutputStream(file), digestAlgorithm);
} else {
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java?rev=1771164&r1=1771163&r2=1771164&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/ResourceDistributionPackage.java Thu Nov 24 15:23:44 2016
@@ -18,6 +18,8 @@
*/
package org.apache.sling.distribution.packaging.impl;
+import static java.util.UUID.randomUUID;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
@@ -50,7 +52,7 @@ public class ResourceDistributionPackage
ResourceResolver resourceResolver,
@Nullable String digestAlgorithm,
@Nullable String digestMessage) {
- super(resource.getPath(), type, digestAlgorithm, digestMessage);
+ super(resource.getPath() + '-' + randomUUID(), type, digestAlgorithm, digestMessage);
this.resourceResolver = resourceResolver;
ValueMap valueMap = resource.getValueMap();
assert type.equals(valueMap.get("type")) : "wrong resource type";