You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/09/28 08:24:48 UTC

karaf git commit: [KARAF-4022]avoid the generated bundle file name too long in startup.properties

Repository: karaf
Updated Branches:
  refs/heads/master 43d8cd0ae -> 266e1da60


[KARAF-4022]avoid the generated bundle file name too long in startup.properties


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/266e1da6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/266e1da6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/266e1da6

Branch: refs/heads/master
Commit: 266e1da6040d84e4267a8aa7cc66e8201c11ca7a
Parents: 43d8cd0
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Sep 28 14:24:26 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Sep 28 14:24:26 2015 +0800

----------------------------------------------------------------------
 .../apache/karaf/profile/assembly/AssemblyDeployCallback.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/266e1da6/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java b/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
index 3edb777..9aefce6 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
@@ -201,7 +201,12 @@ public class AssemblyDeployCallback implements Deployer.DeployCallback {
                 regUri = uri;
                 path = Parser.pathFromMaven(uri);
             } else {
-                path = "generated/" + uri.replaceAll("[^0-9a-zA-Z.\\-_]+", "_");
+                uri = uri.replaceAll("[^0-9a-zA-Z.\\-_]+", "_");
+		if (uri.length() > 256) {
+                    //to avoid the File name too long exception
+                    uri = uri.substring(0, 255);
+                }
+                path = "generated/" + uri;
                 regUri = "file:" + path;
             }
             final Path bundleSystemFile = systemDirectory.resolve(path);