Author: markt
Date: Fri Jan 27 15:17:43 2006
New Revision: 373023
URL: http://svn.apache.org/viewcvs?rev=373023&view=rev
Log:
Fix NPEs and potential NPEs now containerLog is initialized in RealmBase.start()
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java?rev=373023&r1=373022&r2=373023&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Fri Jan 27 15:17:43 2006
@@ -620,6 +620,9 @@
*/
public void start() throws LifecycleException {
+ // Perform normal superclass initialization
+ super.start();
+
// Create the roles PreparedStatement string
preparedRoles = new StringBuffer("SELECT ");
preparedRoles.append(roleNameCol);
@@ -637,9 +640,6 @@
preparedCredentials.append(" WHERE ");
preparedCredentials.append(userNameCol);
preparedCredentials.append(" = ?");
-
- // Perform normal superclass initialization
- super.start();
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java?rev=373023&r1=373022&r2=373023&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
Fri Jan 27 15:17:43 2006
@@ -757,6 +757,9 @@
*/
public void start() throws LifecycleException {
+ // Perform normal superclass initialization
+ super.start();
+
// Validate that we can open our connection - but let tomcat
// startup in case the database is temporarily unavailable
try {
@@ -764,9 +767,6 @@
} catch (SQLException e) {
containerLog.error(sm.getString("jdbcRealm.open"), e);
}
-
- // Perform normal superclass initialization
- super.start();
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java?rev=373023&r1=373022&r2=373023&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Fri Jan 27 15:17:43 2006
@@ -1596,15 +1596,15 @@
*/
public void start() throws LifecycleException {
+ // Perform normal superclass initialization
+ super.start();
+
// Validate that we can open our connection
try {
open();
} catch (NamingException e) {
throw new LifecycleException(sm.getString("jndiRealm.open"), e);
}
-
- // Perform normal superclass initialization
- super.start();
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java?rev=373023&r1=373022&r2=373023&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/MemoryRealm.java
Fri Jan 27 15:17:43 2006
@@ -290,6 +290,9 @@
*/
public synchronized void start() throws LifecycleException {
+ // Perform normal superclass initialization
+ super.start();
+
// Validate the existence of our database file
File file = new File(pathname);
if (!file.isAbsolute())
@@ -314,9 +317,6 @@
} finally {
digester.reset();
}
-
- // Perform normal superclass initialization
- super.start();
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java?rev=373023&r1=373022&r2=373023&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Fri Jan 27 15:17:43 2006
@@ -244,6 +244,9 @@
*/
public synchronized void start() throws LifecycleException {
+ // Perform normal superclass initialization
+ super.start();
+
try {
StandardServer server = (StandardServer) ServerFactory.getServer();
Context context = server.getGlobalNamingContext();
@@ -258,9 +261,6 @@
throw new LifecycleException
(sm.getString("userDatabaseRealm.noDatabase", resourceName));
}
-
- // Perform normal superclass initialization
- super.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
