You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/06/17 12:10:33 UTC

svn commit: r668600 - /servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java

Author: gertv
Date: Tue Jun 17 03:10:33 2008
New Revision: 668600

URL: http://svn.apache.org/viewvc?rev=668600&view=rev
Log:
SMX4KNL: Kernel doesn't start if profile dir is specified but profile isn't

Modified:
    servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java

Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java?rev=668600&r1=668599&r2=668600&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java Tue Jun 17 03:10:33 2008
@@ -236,8 +236,10 @@
         String profileName = m_configProps.getProperty(BundleCache.CACHE_PROFILE_PROP);
         String profileDirName = m_configProps.getProperty(BundleCache.CACHE_PROFILE_DIR_PROP);
 
+        System.out.println(profileDirName);
+        System.out.println(profileName);
         // A profile directory or name must be specified.
-        if ((profileDirName == null) || (profileName.length() == 0)) {
+        if ((profileDirName == null) && (profileName == null || profileName.length() == 0)) {
             System.err.println("Invalid " + CONFIG_PROPERTIES_FILE_NAME + " configuration.  The profile directory was not specified.");
             System.exit(-1);
         }