You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/01/09 08:37:37 UTC
svn commit: r124717 - /cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java
Author: antonio
Date: Sat Jan 8 23:37:36 2005
New Revision: 124717
URL: http://svn.apache.org/viewcvs?view=rev&rev=124717
Log:
Don't check null again
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java?view=diff&rev=124717&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java&r1=124716&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java&r2=124717
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java Sat Jan 8 23:37:36 2005
@@ -86,7 +86,7 @@
* @author <a href="mailto:czoffoli@littlepenguin.org">Christian Zoffoli</a>
* @author <a href="mailto:Martin.Man@seznam.cz">Martin Man</a>
* @since 2002/02/03
- * @version CVS $Id: DbXMLAuthenticatorAction.java,v 1.7 2004/03/28 20:51:24 antonio Exp $
+ * @version CVS $Id$
*
* based on DatabaseAuthenticatorAction created by Martin Man <Ma...@seznam.cz>
*/
@@ -253,42 +253,31 @@
getLogger ().debug ("DBXMLAUTH: query is: " + query);
- Collection col = CreateConnection( conf );
+ Collection col = CreateConnection(conf);
- if ( col != null )
- {
- if ( col.isOpen() )
- {
-
- try
- {
+ if (col != null) {
+ if (col.isOpen()) {
+ try {
XPathQueryService service = (XPathQueryService) col.getService("XPathQueryService", "1.0");
rs = service.query(query);
ResourceIterator results = rs.getIterator();
- if (results.hasMoreResources() == false)
- {
+ if (results.hasMoreResources() == false) {
getLogger ().debug ("DBXMLAUTH: auth failed");
return null;
} else {
getLogger ().debug ("DBXMLAUTH: auth OK");
return rs;
}
-
} catch (XMLDBException e) {
-
getLogger ().debug ("DBXMLAUTH: got exception: " + e);
return null;
-
} finally {
-
// close col
- if (col != null) {
- try {
- col.close();
- } catch (Exception e) { /* ignore */ }
- }
+ try {
+ col.close();
+ } catch (Exception e) { /* ignore */ }
getLogger ().debug ("DBXMLAUTH: collection closed");
}