Changeset 338:5647a31709fe

Show
Ignore:
Timestamp:
09/10/09 15:40:40 (4 years ago)
Author:
tgambet
Branch:
default
convert_revision:
svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@339
Message:

fixed NPE in certain cases

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r232 r338  
    8888                        if (task == null || task.equals("all") || task.equals("observers")) { 
    8989                                 
    90                                 if (!Framework.isUcnInitialized && task.equals("observers")) { 
     90                                if (!Framework.isUcnInitialized && task != null && task.equals("observers")) { 
    9191                                        out.write("Unable to reload the observers because Unicorn is not initialized.\n" + 
    9292                                                        "You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all)."); 
    … …  
    110110                        if (task == null || task.equals("all") || task.equals("tasklist")) { 
    111111                                 
    112                                 if (!Framework.isUcnInitialized && task.equals("tasklist")) { 
     112                                if (!Framework.isUcnInitialized && task != null && task.equals("tasklist")) { 
    113113                                        out.write("Unable to reload the tasklist because Unicorn is not initialized.\n" + 
    114114                                                        "You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all)."); 
    … …  
    132132                        if (task == null || task.equals("all") || task.equals("language")) { 
    133133                                 
    134                                 if (!Framework.isUcnInitialized && task.equals("language")) { 
     134                                if (!Framework.isUcnInitialized && task != null && task.equals("language")) { 
    135135                                        out.write("Unable to reload the language files because Unicorn is not initialized.\n" + 
    136136                                                        "You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");