activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1049780 - /activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
Date Thu, 16 Dec 2010 04:37:11 GMT
Author: chirino
Date: Thu Dec 16 04:37:11 2010
New Revision: 1049780

URL: http://svn.apache.org/viewvc?rev=1049780&view=rev
Log:
Only set java.security.auth.login.config system prop if not yet set

Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala?rev=1049780&r1=1049779&r2=1049780&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
Thu Dec 16 04:37:11 2010
@@ -66,9 +66,11 @@ class Run extends Action with Logging {
         error("Configuration file'%s' does not exist.\n\nTry creating a broker instance using
the 'apollo create' command.".format(conf));
       }
 
-      val login_config = conf.getParentFile / "login.config"
-      if( login_config.exists ) {
-        System.setProperty("java.security.auth.login.config", login_config.getCanonicalPath)
+      if( System.getProperty("java.security.auth.login.config")==null ) {
+        val login_config = conf.getParentFile / "login.config"
+        if( login_config.exists ) {
+          System.setProperty("java.security.auth.login.config", login_config.getCanonicalPath)
+        }
       }
 
       val webapp = {



Mime
View raw message