Changeset 1079:64bcc416a0fb

Timestamp:

05/17/10 15:51:57 (3 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@1080

Message:

fixed: initLanguage() called before initTasklist()

Files:

• src/org/w3c/unicorn/action/InitAction.java (modified) (2 diffs)

src/org/w3c/unicorn/action/InitAction.java

@@ -108 +108 @@
                         }
                         
+                        if (task == null || task.equals("all") || task.equals("language")) {
+                                
+                                if (!Framework.isUcnInitialized && task != null && task.equals("language")) {
+                                        out.write("Unable to reload the language files because Unicorn is not initialized.\n" +
+                                                        "You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
+                                        out.close();
+                                        return;
+                                }
+                                
+                                out.write("Loading language files: ");
+                                response.flushBuffer();
+                                try {
+                                        Framework.initLanguages();
+                                        out.write("OK\n");
+                                } catch (InitializationFailedException e) {
+                                        Framework.logger.fatal(e.getMessage(), e);
+                                        out.write("FAILED\n" + e);
+                                        Framework.isUcnInitialized = false;
+                                        return;
+                                }
+                        }
+                        
                         if (task == null || task.equals("all") || task.equals("tasklist")) {
                                 
@@ -121 +143 @@
                                 try {
                                         Framework.initTasklists();
-                                        out.write("OK\n");
-                                } catch (InitializationFailedException e) {
-                                        Framework.logger.fatal(e.getMessage(), e);
-                                        out.write("FAILED\n" + e);
-                                        Framework.isUcnInitialized = false;
-                                        return;
-                                }
-                        }
-                        
-                        if (task == null || task.equals("all") || task.equals("language")) {
-                                
-                                if (!Framework.isUcnInitialized && task != null && task.equals("language")) {
-                                        out.write("Unable to reload the language files because Unicorn is not initialized.\n" +
-                                                        "You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
-                                        out.close();
-                                        return;
-                                }
-                                
-                                out.write("Loading language files: ");
-                                response.flushBuffer();
-                                try {
-                                        Framework.initLanguages();
                                         out.write("OK\n");
                                 } catch (InitializationFailedException e) {