You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/06/23 20:16:18 UTC

svn commit: r550075 - /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java

Author: schor
Date: Sat Jun 23 11:16:18 2007
New Revision: 550075

URL: http://svn.apache.org/viewvc?view=rev&rev=550075
Log:
[UIMA-468] make static arraylists initialization threadsafe.

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?view=diff&rev=550075&r1=550074&r2=550075
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Sat Jun 23 11:16:18 2007
@@ -686,9 +686,8 @@
    * never instantiated. But it is a very slight performance boost, and it may be safer given
    * possible future changes to these types' implementations.
    */
-	private static Collection builtInsWithNoJCas = new ArrayList();
-	{
-		if (builtInsWithNoJCas.size() == 0) {
+	private static final Collection builtInsWithNoJCas = new ArrayList();
+	static {
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_BOOLEAN);
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_BYTE);
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_SHORT);
@@ -699,12 +698,10 @@
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_STRING);
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_ARRAY_BASE);
 			builtInsWithNoJCas.add(CAS.TYPE_NAME_LIST_BASE);
-		}
 	}
 
-	private static Collection builtInsWithAltNames = new ArrayList();
-	{ // initialization code
-		if (builtInsWithAltNames.size() == 0) {
+	private static final Collection builtInsWithAltNames = new ArrayList();
+	static { // initialization code
 			builtInsWithAltNames.add(CAS.TYPE_NAME_TOP);
 			builtInsWithAltNames.add(CAS.TYPE_NAME_STRING_ARRAY);
 			builtInsWithAltNames.add(CAS.TYPE_NAME_BOOLEAN_ARRAY);
@@ -731,7 +728,6 @@
 			builtInsWithAltNames.add(CAS.TYPE_NAME_ANNOTATION_BASE);
 			builtInsWithAltNames.add(CAS.TYPE_NAME_ANNOTATION);
 			builtInsWithAltNames.add(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
-		}
 	}
 
   
@@ -1498,7 +1494,4 @@
     }
     return viewList.iterator();
   }
-  
-  
-
 }