Author: iocanel
Date: Wed Sep 15 17:29:00 2010
New Revision: 997407
URL: http://svn.apache.org/viewvc?rev=997407&view=rev
Log:
[KARAF-180] Removed calls to String.isEmpty() and Statement.isOpen() so that
the JDBC login module is compatible with JSE 1.5 and JSE 1.6.
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java?rev=997407&r1=997406&r2=997407&view=diff
==============================================================================
---
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
(original)
+++
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCLoginModule.java
Wed Sep 15 17:29:00 2010
@@ -58,7 +58,7 @@ public class JDBCLoginModule extends Abs
public void initialize(Subject subject, CallbackHandler callbackHandler,
Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, options);
datasourceURL = (String) options.get(DATASOURCE);
- if (datasourceURL == null || datasourceURL.isEmpty()) {
+ if (datasourceURL == null || datasourceURL.trim().length() == 0) {
LOG.error("No datasource was specified ");
} else if (!datasourceURL.startsWith(JNDI) &&
!datasourceURL.startsWith(OSGI)) {
LOG.error("Invalid datasource lookup protocol");
@@ -74,7 +74,7 @@ public class JDBCLoginModule extends Abs
public Object createDatasource(String url) throws Exception {
if (url == null) {
throw new Exception("Illegal datasource url format. Datasource URL
cannot be null.");
- } else if (url.trim().isEmpty()) {
+ } else if (url.trim().length() == 0) {
throw new Exception("Illegal datasource url format. Datasource URL
cannot be empty.");
} else if (url.startsWith(JNDI)) {
String jndiName = url.substring(JNDI.length());
@@ -180,19 +180,19 @@ public class JDBCLoginModule extends Abs
throw new LoginException("Error has occured while retrieving
credentials from databse:" + ex.getMessage());
} finally {
try {
- if (passwordResultSet != null &&
!passwordResultSet.isClosed()) {
+ if (passwordResultSet != null) {
passwordResultSet.close();
}
- if (passwordStatement != null &&
!passwordStatement.isClosed()) {
+ if (passwordStatement != null) {
passwordStatement.close();
}
- if (roleResultSet != null && !roleResultSet.isClosed()) {
+ if (roleResultSet != null) {
roleResultSet.close();
}
- if (roleStatement != null && !roleStatement.isClosed()) {
+ if (roleStatement != null) {
roleStatement.close();
}
- if (connection != null && !connection.isClosed()) {
+ if (connection != null) {
connection.close();
}
} catch (SQLException ex) {
