db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r927433 - in /db/derby/code/branches/10.5: ./ java/engine/org/apache/derby/impl/sql/execute/ java/testing/org/apache/derbyTesting/functionTests/tests/memory/
Date Thu, 25 Mar 2010 14:51:05 GMT
Author: kahatlen
Date: Thu Mar 25 14:51:05 2010
New Revision: 927433

URL: http://svn.apache.org/viewvc?rev=927433&view=rev
Log:
DERBY-4571: Memory leak on server when using "SET ROLE" command

Merged fix from trunk (revision 918359).

Added:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java
      - copied unchanged from r918359, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java
Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 14:51:05 2010
@@ -1 +1 @@
-/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,911315,915733,916075,916897,921028
+/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,911315,915733,916075,916897,918359,921028

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java?rev=927433&r1=927432&r2=927433&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
Thu Mar 25 14:51:05 2010
@@ -417,6 +417,13 @@ public abstract class BaseActivation imp
 
 			LanguageConnectionContext lcc = getLanguageConnectionContext();
 
+            // Remove all the dependencies this activation has. It won't need
+            // them after it's closed, so let's free up the memory in the
+            // dependency manager. (DERBY-4571)
+            DependencyManager dm =
+                    lcc.getDataDictionary().getDependencyManager();
+            dm.clearDependencies(lcc, this);
+
 			lcc.removeActivation(this);
 			if (preStmt != null) {
 				preStmt.finish(lcc);

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java?rev=927433&r1=927432&r2=927433&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
Thu Mar 25 14:51:05 2010
@@ -38,6 +38,7 @@ public class _Suite extends BaseJDBCTest
         suite.addTest(BlobMemTest.suite());
         suite.addTest(ClobMemTest.suite());
         suite.addTest(MultiByteClobTest.suite());
-                return suite;
+        suite.addTest(RolesDependencyTest.suite());
+        return suite;
     }
 }



Mime
View raw message