[exo-jcr-commits] exo-jcr SVN: r4419 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version and 1 other directories.

Author: tolusha Date: 2011-05-24 02:48:30 -0400 (Tue, 24 May 2011) New Revision: 4419 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/InternalQName.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java Log: EXOJCR-1187: avoid using intern calls Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/InternalQName.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/InternalQName.java 2011-05-24 06:47:34 UTC (rev 4418) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/InternalQName.java 2011-05-24 06:48:30 UTC (rev 4419) @@ -40,7 +40,7 @@ */ public InternalQName(String namespace, String name) { - super(safeIntern(namespace), safeIntern(name)); + super(safeIntern(namespace), name); } private static String safeIntern(String s) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java 2011-05-24 06:47:34 UTC (rev 4418) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java 2011-05-24 06:48:30 UTC (rev 4419) @@ -123,8 +123,8 @@ TransientNodeData vh = init(versionable, changes); // TransientItemData - this.parentIdentifier = vh.getParentIdentifier().intern(); - this.identifier = vh.getIdentifier().intern(); + this.parentIdentifier = vh.getParentIdentifier(); + this.identifier = vh.getIdentifier(); this.qpath = vh.getQPath(); this.persistedVersion = vh.getPersistedVersion(); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-05-24 06:47:34 UTC (rev 4418) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyResourceLoader.java 2011-05-24 06:48:30 UTC (rev 4419) @@ -79,30 +79,18 @@ { if (LOG.isDebugEnabled()) LOG.debug("Process file: " + filename); - URL resource = null; - filename = filename.intern(); - synchronized (filename) - { - resource = resources.get(filename); - boolean inCache = resource != null; - if (inCache && !checkResource(resource)) - resource = null; - for (int i = 0; i < roots.length && resource == null; i++) - { - // In JCR URL path represented by fragment jcr://repository/workspace#/path - URL tmp = - ("jcr".equals(roots[i].getProtocol())) ? new URL(roots[i], "#" + roots[i].getRef() + filename) - : new URL(roots[i], filename); - if (checkResource(tmp)) - resource = tmp; - } - if (resource != null) - resources.put(filename, resource); - else if (inCache) - resources.remove(filename); - } - return resource; + return super.getResource(filename); } + + /** + * @see org.exoplatform.services.rest.ext.groovy.DefaultGroovyResourceLoader#createURL(java.net.URL,java.lang.String) + */ + @Override + protected URL createURL(URL root, String filename) throws MalformedURLException + { + return ("jcr".equals(root.getProtocol())) ? new URL(root, "#" + root.getRef() + filename) + : new URL(root, filename); + } /** * @see org.exoplatform.services.rest.ext.groovy.DefaultGroovyResourceLoader#checkResource(java.net.URL)