X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FInitUtils.java;h=821808017644b9dcd17089cd426809b2d73c7a66;hb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;hp=70ea9ec486e6838f526c5de3b6733eb0a93a5364;hpb=f4da6777015da3fc392138f0c01cea2f2add9ed3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java
index 70ea9ec48..821808017 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java
@@ -182,7 +182,8 @@ public class InitUtils {
 			// TODO downgrade security level
 		}
 		for (String userAdminUri : userAdminUris.split(" "))
-			uris.add(userAdminUri);
+			if (!userAdminUri.trim().equals(""))
+				uris.add(userAdminUri);
 
 		// Interprets URIs
 		for (String uri : uris) {
@@ -238,15 +239,17 @@ public class InitUtils {
 				// TODO also uncompress archives
 				if (initDir.exists())
 					try {
-						FileUtils.copyDirectory(initDir, KernelUtils.getOsgiInstanceDir(), new FileFilter() {
+						// TODO use NIO utilities
+						FileUtils.copyDirectory(initDir, KernelUtils.getOsgiInstancePath("").toFile(),
+								new FileFilter() {
 
-							@Override
-							public boolean accept(File pathname) {
-								if (pathname.getName().equals(".svn") || pathname.getName().equals(".git"))
-									return false;
-								return true;
-							}
-						});
+									@Override
+									public boolean accept(File pathname) {
+										if (pathname.getName().equals(".svn") || pathname.getName().equals(".git"))
+											return false;
+										return true;
+									}
+								});
 						log.info("CMS initialized from " + initDir.getCanonicalPath());
 					} catch (IOException e) {
 						throw new RuntimeException("Cannot initialize from " + initDir, e);