fix recursive loops

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@796858 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index 9c90fdb..12d94d5 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -717,7 +717,7 @@ public class DataSourceProxy implements PoolConfiguration {
      */
     @Override
     public String getName() {
-        return getName();
+        return getPoolProperties().getName();
     }
 
     /** 

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
index 6459f45..f2dd786 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
@@ -239,7 +239,7 @@ public class ConnectionPool extends NotificationBroadcasterSupport implements Co
     }    
 
     public String getName() {
-        return getName();
+        return this.getPoolName();
     }
 
     public int getNumTestsPerEvictionRun() {