You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/10 15:09:40 UTC
svn commit: r1033478 -
/geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
Author: genspring
Date: Wed Nov 10 14:09:39 2010
New Revision: 1033478
URL: http://svn.apache.org/viewvc?rev=1033478&view=rev
Log:
GERONIMO-5679 logic cleanup.
Modified:
geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
Modified: geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=1033478&r1=1033477&r2=1033478&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java (original)
+++ geronimo/server/branches/2.1/plugins/derby/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java Wed Nov 10 14:09:39 2010
@@ -89,11 +89,11 @@ public class DerbySystemGBean implements
// set system property to enable Derby user authentication
- if (System.getProperty("derby.connection.requireAuthentication") == null) {
+ if (System.getProperty("derby.connection.requireAuthentication")!=null && "false".equals(System.getProperty("derby.connection.requireAuthentication"))){
+ disableAuthentication = true;
+ }else {
System.setProperty("derby.connection.requireAuthentication", "true");
System.setProperty("derby.authentication.provider", "org.apache.geronimo.derby.DerbyUserAuthenticator");
- }else if ("false".equals(System.getProperty("derby.connection.requireAuthentication"))){
- disableAuthentication = true;
}
// load the Embedded driver to initialize the home