Changeset 1237:bf4e13ea3f44

Timestamp:

06/14/10 14:54:29 (3 years ago)

Author:

Thomas Gambet <tgambet@…>

Branch:

default

Message:

tries to guess unicorn.home only if not set in the jvm

Files:

• src/org/w3c/unicorn/Framework.java (modified) (1 diff)

src/org/w3c/unicorn/Framework.java

@@ -126 +126 @@
         
         public static void initCore() throws InitializationFailedException {
-                try {
-                        URL classesDir = Framework.class.getResource("/");
-                        File classes = new File(classesDir.toURI());
-                        File webInf = new File(classes.getParent());
-                        System.setProperty("unicorn.home", webInf.getParent());
-                } catch (URISyntaxException e) {
-                        throw new InitializationFailedException(e.getMessage(), e);
+                if (System.getProperty("unicorn.home") == null) {
+                        try {
+                                URL classesDir = Framework.class.getResource("/");
+                                File classes = new File(classesDir.toURI());
+                                File webInf = new File(classes.getParent());
+                                System.setProperty("unicorn.home", webInf.getParent());
+                        } catch (URISyntaxException e) {
+                                throw new InitializationFailedException(e.getMessage(), e);
+                        }
                 }