svn commit: r1444561 - in /jena/trunk/jena-arq/src/main/java/org/apache/jena/riot: Lang.java RDFLanguages.java

[an...@apache.org]

Author: andy
Date: Sun Feb 10 16:26:51 2013
New Revision: 1444561

URL: http://svn.apache.org/r1444561
Log:
Switch to using the JVM to initialize the class once only.

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1444561&r1=1444560&r2=1444561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Sun Feb 10 16:26:51 2013
@@ -42,8 +42,7 @@ public class Lang 
     //  public static final Lang NQUADS = RDFLanguages.NQuads ; 
     //  public static final Lang TRIG = RDFLanguages.TriG ; 
 
-    // To avoid an initialization circularity, these are set by RDFLaguages.
-    // Using the RDFLanguages constants is preferred style.
+    // To avoid an initialization circularity, these are set by RDFLanguages.
 
     public static Lang RDFXML ; 
     public static Lang NTRIPLES ; 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1444561&r1=1444560&r2=1444561&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Sun Feb 10 16:26:51 2013
@@ -119,12 +119,10 @@ public class RDFLanguages
     private static Map<String, Lang> mapFileExtToLang                  = DS.map() ;
 
     // ----------------------
-    static { init() ; }
-    private static boolean initialized = false ;
-    public static synchronized void init ()
+    public static void init() {}
+    static { init$() ; }
+    private static synchronized void init$()
     {
-        if ( initialized ) return ;
-        initialized = true ;
         initStandard() ;
         // Needed to avoid a class initialization loop. 
         Lang.RDFXML = RDFLanguages.RDFXML ;