From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Jul 2009 19:48:56 +0000 (+0000)
Subject: fix recursive loops
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e66ed10f139ae9947d999515464c2818ccf6a0ff;p=tomcat7.0

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 9c90fdb97..12d94d522 100644
--- 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 6459f459b..f2dd78626 100644
--- 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() {