W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2009

2006/unicorn/src/org/w3c/unicorn/action InitAction.java,1.4,1.5

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 10 Sep 2009 15:40:42 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MlllK-0000su-DY@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv3383/src/org/w3c/unicorn/action

Modified Files:
	InitAction.java 
Log Message:
fixed NPE in certain cases

Index: InitAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/InitAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- InitAction.java	31 Aug 2009 12:02:38 -0000	1.4
+++ InitAction.java	10 Sep 2009 15:40:40 -0000	1.5
@@ -87,7 +87,7 @@
 			
 			if (task == null || task.equals("all") || task.equals("observers")) {
 				
-				if (!Framework.isUcnInitialized && task.equals("observers")) {
+				if (!Framework.isUcnInitialized && task != null && task.equals("observers")) {
 					out.write("Unable to reload the observers 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();
@@ -109,7 +109,7 @@
 			
 			if (task == null || task.equals("all") || task.equals("tasklist")) {
 				
-				if (!Framework.isUcnInitialized && task.equals("tasklist")) {
+				if (!Framework.isUcnInitialized && task != null && task.equals("tasklist")) {
 					out.write("Unable to reload the tasklist 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();
@@ -131,7 +131,7 @@
 			
 			if (task == null || task.equals("all") || task.equals("language")) {
 				
-				if (!Framework.isUcnInitialized && 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();
Received on Thursday, 10 September 2009 15:40:52 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:14 GMT