Author: maartenc
Date: Sun Aug 19 15:58:20 2012
New Revision: 1374779
URL: http://svn.apache.org/viewvc?rev=1374779&view=rev
Log:
FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362) (merged from
trunk)
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/CHANGES.txt
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/module/id/ModuleId.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1374776
Modified: ant/ivy/core/branches/2.3.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/CHANGES.txt?rev=1374779&r1=1374778&r2=1374779&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.3.x/CHANGES.txt Sun Aug 19 15:58:20 2012
@@ -129,6 +129,7 @@ for detailed view of each issue, please
2.3.x
=====================================
+- FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362)
- FIX: NullPointerExeption in AbstractOSGiResolver (IVY-1343) (thanks to
Thomas Kurpick)
- FIX: Delivered ivy descriptor inconsistent with resolve report / retrieve
and other post-resolve actions (IVY-1300) (thanks to Ed Burcher)
- FIX: The Updatesite resolver is downloading Eclipse features instead of
Eclipse bundle/plugin
Modified:
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/module/id/ModuleId.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/module/id/ModuleId.java?rev=1374779&r1=1374778&r2=1374779&view=diff
==============================================================================
---
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/module/id/ModuleId.java
(original)
+++
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/module/id/ModuleId.java
Sun Aug 19 15:58:20 2012
@@ -59,7 +59,7 @@ public class ModuleId implements Compara
* the module id to return
* @return a unit instance of the given module id.
*/
- public static ModuleId intern(ModuleId moduleId) {
+ public static synchronized ModuleId intern(ModuleId moduleId) {
ModuleId r = (ModuleId) CACHE.get(moduleId);
if (r == null) {
r = moduleId;
