geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1366283 - /geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
Date Fri, 27 Jul 2012 04:41:04 GMT
Author: genspring
Date: Fri Jul 27 04:41:04 2012
New Revision: 1366283

URL: http://svn.apache.org/viewvc?rev=1366283&view=rev
Log:
GERONIMO-6375 DuplicateBundleException when runing geronimo 3.0 from a Symbolic-link path
in Linux system.  -- Resolve the symbolic name for the initial bundles to start.

Modified:
    geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java

Modified: geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java?rev=1366283&r1=1366282&r2=1366283&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
(original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
Fri Jul 27 04:41:04 2012
@@ -408,12 +408,15 @@ public class FrameworkLauncher {
         ArrayList<File> bundleDirs = new ArrayList<File>();
 
         String defaultRepo = System.getProperty(DEFAULT_REPO, "repository");
+        
+        File GeronimoHomeRepo = new File(geronimoHome, defaultRepo).getCanonicalFile();
+        File GeronimoBaseRepo = new File(geronimoBase, defaultRepo).getCanonicalFile();
 
-        if (geronimoBase.equals(geronimoHome)) {
-            bundleDirs.add(new File(geronimoHome, defaultRepo));
+        if (GeronimoHomeRepo.getCanonicalPath().equals(GeronimoBaseRepo.getCanonicalPath()))
{
+            bundleDirs.add(GeronimoHomeRepo);
         } else {
-            bundleDirs.add(new File(geronimoBase, defaultRepo));
-            bundleDirs.add(new File(geronimoHome, defaultRepo));
+            bundleDirs.add(GeronimoHomeRepo);
+            bundleDirs.add(GeronimoBaseRepo);
         }
 
         return loadStartupProperties(startupProps, bundleDirs);



Mime
View raw message