You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/10/24 13:28:42 UTC
svn commit: r1766405 - in /jackrabbit/branches/2.10: ./
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java
Author: reschke
Date: Mon Oct 24 13:28:42 2016
New Revision: 1766405
URL: http://svn.apache.org/viewvc?rev=1766405&view=rev
Log:
JCR-4047: NodeTypeRegistryImpl - work around (correct) animal sniffer diagnostics by not using ConcurrentHashMap as it's not needed here anyway (ported to 2.10)
Modified:
jackrabbit/branches/2.10/ (props changed)
jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java
Propchange: jackrabbit/branches/2.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 13:28:42 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1709811,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558
+/jackrabbit/trunk:1709811,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398
Modified: jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java?rev=1766405&r1=1766404&r2=1766405&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java (original)
+++ jackrabbit/branches/2.10/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java Mon Oct 24 13:28:42 2016
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
import javax.jcr.NamespaceRegistry;
import javax.jcr.PropertyType;
@@ -603,8 +602,8 @@ public class NodeTypeRegistryImpl implem
private class NodeTypeDefinitionMap implements Map<Name, QNodeTypeDefinition> {
// map of node type names and node type definitions
- private final ConcurrentHashMap<Name, QNodeTypeDefinition> nodetypeDefinitions =
- new ConcurrentHashMap<Name, QNodeTypeDefinition>();
+ private Map<Name, QNodeTypeDefinition> nodetypeDefinitions =
+ new HashMap<Name, QNodeTypeDefinition>();
private Collection<QNodeTypeDefinition> getValues() {
return nodetypeDefinitions.values();