Author: boisvert
Date: Mon Sep 18 16:06:48 2006
New Revision: 447623
URL: http://svn.apache.org/viewvc?view=rev&rev=447623
Log:
Remove deadwood and rethrow exception instead of swallowing it
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/cache/LeastRecentlyUsedCache.java
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/SharedLocalConnectionManager.java
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/XAConnectionManager.java
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/XAManagedConnectionFactory.java
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/jdbc/xa/wrapper/XAConnectionImpl.java
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/cache/LeastRecentlyUsedCache.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/cache/LeastRecentlyUsedCache.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/cache/LeastRecentlyUsedCache.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/cache/LeastRecentlyUsedCache.java
Mon Sep 18 16:06:48 2006
@@ -22,8 +22,10 @@
*/
package org.opentools.minerva.cache;
-import java.io.PrintWriter;
-import java.util.*;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
/**
* A Least Recently Used cache implementation. The object in the
@@ -36,7 +38,6 @@
public class LeastRecentlyUsedCache implements ObjectCache {
private Object lock = new Object();
private HashMap keyMap = new HashMap();
- private PrintWriter log = new PrintWriter(System.out);
private Node mostRecentNode, leastRecentNode;
private int size;
private int maxSize;
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/SharedLocalConnectionManager.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/SharedLocalConnectionManager.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/SharedLocalConnectionManager.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/SharedLocalConnectionManager.java
Mon Sep 18 16:06:48 2006
@@ -180,7 +180,7 @@
try {
listener.enlist();
} catch(Exception e) {
- ResourceException re = new ResourceException("Unable to
register listeners for connection: "+e, e);
+ throw new ResourceException("Unable to register listeners for
connection: "+e, e);
}
} else {
// Why do we care? Old trans is over, work will be lost.
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/XAConnectionManager.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/XAConnectionManager.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/XAConnectionManager.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/XAConnectionManager.java
Mon Sep 18 16:06:48 2006
@@ -145,7 +145,7 @@
try {
listener.enlist();
} catch(Exception e) {
- ResourceException re = new ResourceException("Unable to
register listeners for connection: "+e, e);
+ throw new ResourceException("Unable to register listeners for
connection: "+e, e);
}
} else {
// Why do we care? Old trans is over, work will be lost.
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java
Mon Sep 18 16:06:48 2006
@@ -104,7 +104,6 @@
public ManagedConnection matchManagedConnections(Set cons, Subject sub,
ConnectionRequestInfo info) throws ResourceException {
// Set user and password to default
String user = username;
- String pw = password;
// Check passed Subject and ConnectionRequestInfo for user/password
overrides
if(sub != null) {
@@ -112,7 +111,6 @@
for(Iterator it = creds.iterator(); it.hasNext(); ) {
PasswordCredential pc = (PasswordCredential)it.next();
user = pc.getUserName();
- pw = new String(pc.getPassword());
break;
}
} else {
@@ -122,7 +120,6 @@
}
JDBCConnectionRequestInfo jdbcInfo =
(JDBCConnectionRequestInfo)info;
user = jdbcInfo.user;
- pw = jdbcInfo.password;
}
}
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/XAManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/XAManagedConnectionFactory.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/XAManagedConnectionFactory.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/XAManagedConnectionFactory.java
Mon Sep 18 16:06:48 2006
@@ -145,7 +145,6 @@
public ManagedConnection matchManagedConnections(Set cons, Subject sub,
ConnectionRequestInfo info) throws javax.resource.ResourceException {
// Set user and password to default
String user = username;
- String pw = password;
// Check passed Subject and ConnectionRequestInfo for user/password
overrides
if(sub != null) {
@@ -153,7 +152,6 @@
for(Iterator it = creds.iterator(); it.hasNext(); ) {
PasswordCredential pc = (PasswordCredential)it.next();
user = pc.getUserName();
- pw = new String(pc.getPassword());
break;
}
} else {
@@ -163,7 +161,6 @@
}
JDBCConnectionRequestInfo jdbcInfo =
(JDBCConnectionRequestInfo)info;
user = jdbcInfo.user;
- pw = jdbcInfo.password;
}
}
Modified:
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/jdbc/xa/wrapper/XAConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/jdbc/xa/wrapper/XAConnectionImpl.java?view=diff&rev=447623&r1=447622&r2=447623
==============================================================================
---
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/jdbc/xa/wrapper/XAConnectionImpl.java
(original)
+++
incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/jdbc/xa/wrapper/XAConnectionImpl.java
Mon Sep 18 16:06:48 2006
@@ -67,7 +67,6 @@
*/
@SuppressWarnings("unchecked")
public class XAConnectionImpl implements XAConnection, PooledObject {
- private final static String CLOSED = "Connection has been closed!";
private Connection con;
private XAResourceImpl resource;
private Vector listeners, poolListeners;
@@ -143,7 +142,7 @@
public void clientConnectionClosed() {
if(--clientConnectionCount > 0)
return; // Only take action if the last connection referring to
this is closed
- boolean trans = resource.isTransaction(); // could be committed
directly on notification? Seems unlikely, but let's not rule it out.
+// boolean trans = resource.isTransaction(); // could be committed
directly on notification? Seems unlikely, but let's not rule it out.
Vector local = (Vector)listeners.clone();
for(int i=local.size()-1; i>=0; i--)
((ConnectionEventListener)local.elementAt(i)).connectionClosed(new
ConnectionEvent(this));
