Fixes npe and return type of auth.run()

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/InitCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/InitCommand.java
index 890e4ab..632e139 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/InitCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/InitCommand.java
@@ -75,7 +75,7 @@ public class InitCommand extends Pazpar2Command implements ServiceProxyCommand {
       newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }\r
     newCommand.spCommand = new InitCommandSp(this);\r
-    if (spCommand.getUploadedInitDoc()!=null) {\r
+    if (spCommand != null && spCommand.getUploadedInitDoc()!=null) {\r
       newCommand.spCommand.setUploadedInitDoc(spCommand.getUploadedInitDoc());\r
     }\r
     return newCommand;\r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
index a4fa51f..25ea8db 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
@@ -95,7 +95,7 @@ public abstract class Pazpar2Command implements Serializable  {
     }\r
     return run();\r
   }\r
-  \r
+    \r
   /**\r
    * Executes the command in a thread.  \r
    * \r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
index 75d46aa..8869d83 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/AuthCommand.java
@@ -7,6 +7,7 @@ import com.indexdata.mkjsf.pazpar2.Pz2Service;
 import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
+import com.indexdata.mkjsf.pazpar2.data.sp.AuthResponse;\r
 import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
 \r
 /**\r
@@ -32,7 +33,7 @@ public class AuthCommand extends Pazpar2Command implements ServiceProxyCommand {
     ClientCommandResponse response = (ClientCommandResponse) Pz2Service.get().getSearchClient().executeCommand(this);      \r
     String renamedResponse = renameResponseElement(response.getResponseString(), "auth");    \r
     response.setResponseToParse(renamedResponse);\r
-    SpResponseDataObject responseObject = (SpResponseDataObject) ResponseParser.getParser().getDataObject(response);    \r
+    AuthResponse responseObject = (AuthResponse) ResponseParser.getParser().getDataObject(response);    \r
     if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
       Pz2Service.get().getPzresp().put(getCommandName(), responseObject);\r
     }\r