You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2015/03/31 14:25:08 UTC
svn commit: r1670315 - in /lenya/branches/BRANCH_2_1_X/src:
modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/
modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/
modules/navigation/java/src/org/apache/len...
Author: andreas
Date: Tue Mar 31 12:25:07 2015
New Revision: 1670315
URL: http://svn.apache.org/r1670315
Log:
Properly release linkResolver to avoid memory leak.
Modified:
lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java
lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
lenya/branches/BRANCH_2_1_X/src/modules/navigation/java/src/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java?rev=1670315&r1=1670314&r2=1670315&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/components/modules/input/UuidToUrlModule.java Tue Mar 31 12:25:07 2015
@@ -44,9 +44,10 @@ public class UuidToUrlModule extends Abs
public Object getAttribute(String name, Configuration modeConf, Map objectModel)
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
+ LinkResolver linkResolver = null;
try {
DocumentFactory factory = DocumentUtil.getDocumentFactory(this.manager, request);
- LinkResolver linkResolver = (LinkResolver) this.manager.lookup(LinkResolver.ROLE);
+ linkResolver = (LinkResolver) this.manager.lookup(LinkResolver.ROLE);
String currentUrl = ServletHelper.getWebappURI(request);
UuidToUrlRewriter rewriter = new UuidToUrlRewriter(currentUrl, linkResolver, factory);
@@ -58,6 +59,10 @@ public class UuidToUrlModule extends Abs
} catch (final Exception e) {
throw new ConfigurationException("Resolving link " + name + " failed: ", e);
+ } finally {
+ if (linkResolver != null) {
+ this.manager.release(linkResolver);
+ }
}
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java?rev=1670315&r1=1670314&r2=1670315&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java Tue Mar 31 12:25:07 2015
@@ -169,6 +169,10 @@ public class DocumentSourceFactory exten
throw e;
} catch (Exception e) {
throw new RuntimeException(e);
+ } finally {
+ if (resolver != null) {
+ this.manager.release(resolver);
+ }
}
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules/navigation/java/src/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/navigation/java/src/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java?rev=1670315&r1=1670314&r2=1670315&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/navigation/java/src/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/navigation/java/src/org/apache/lenya/modules/navigation/SiteMetaDataTransformer.java Tue Mar 31 12:25:07 2015
@@ -75,7 +75,7 @@ public class SiteMetaDataTransformer ext
public void dispose() {
super.dispose();
- if (this.linkResolver == null) {
+ if (this.linkResolver != null) {
this.manager.release(linkResolver);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org