From: Adrian B. <adr...@jb...> - 2005-06-17 17:45:47
|
User: adrian Date: 05/06/17 13:45:10 Modified: src/main/org/jboss/resource/connectionmanager InternalManagedConnectionPool.java BaseConnectionManager2.java Log: Some more sourcecode tidyup Revision Changes Path 1.31 +4 -4 jbosscx/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java (In the diff below, changes in quantity of whitespace are not shown.) Index: InternalManagedConnectionPool.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -b -r1.30 -r1.31 --- InternalManagedConnectionPool.java 8 Sep 2004 08:48:53 -0000 1.30 +++ InternalManagedConnectionPool.java 17 Jun 2005 17:45:10 -0000 1.31 @@ -20,6 +20,7 @@ import org.jboss.logging.Logger; import org.jboss.resource.JBossResourceException; +import org.jboss.util.UnreachableStatementException; import EDU.oswego.cs.dl.util.concurrent.FIFOSemaphore; import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean; @@ -29,7 +30,7 @@ * * @author <a href="mailto:d_j...@us...">David Jencks</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.30 $ + * @version $Revision: 1.31 $ */ public class InternalManagedConnectionPool @@ -235,9 +236,8 @@ checkedOut.remove(cl); } permits.release(); - if (t instanceof ResourceException) - throw (ResourceException) t; - throw new JBossResourceException("Unexpected throwable while trying to create a connection: " + cl, t); + JBossResourceException.rethrowAsResourceException("Unexpected throwable while trying to create a connection: " + cl, t); + throw new UnreachableStatementException(); } } else 1.53 +3 -5 jbosscx/src/main/org/jboss/resource/connectionmanager/BaseConnectionManager2.java (In the diff below, changes in quantity of whitespace are not shown.) Index: BaseConnectionManager2.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/connectionmanager/BaseConnectionManager2.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -b -r1.52 -r1.53 --- BaseConnectionManager2.java 17 Jun 2005 09:14:44 -0000 1.52 +++ BaseConnectionManager2.java 17 Jun 2005 17:45:10 -0000 1.53 @@ -60,7 +60,7 @@ * @author <a href="mailto:d_j...@us...">David Jencks</a> * @author <a href="mailto:E....@ce...">Erwin Guib</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.52 $ + * @version $Revision: 1.53 $ * @jmx:mbean name="jboss.jca:service=BaseConnectionManager" * extends="org.jboss.system.ServiceMBean" */ @@ -99,9 +99,7 @@ protected static void rethrowAsResourceException(String message, Throwable t) throws ResourceException { - if (t instanceof ResourceException) - throw (ResourceException) t; - throw new JBossResourceException(message, t); + JBossResourceException.rethrowAsResourceException(message, t); } /** @@ -910,4 +908,4 @@ return credential; } } -}// BaseConnectionManager2 +} |