diff --git a/openbis-ipad/source/core-plugins/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar b/openbis-ipad/source/core-plugins/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar index 960af774d9c21f44aa9c4e2d393259ed161f6c6b..6d1202283a8a4d4ace2bf876be1ac6491bb0f53c 100644 Binary files a/openbis-ipad/source/core-plugins/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar and b/openbis-ipad/source/core-plugins/ipad-ui/1/dss/reporting-plugins/ipad-read-service-v1/lib/ipad-framework.jar differ diff --git a/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/RequestHandlerDispatcher.java b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/RequestHandlerDispatcher.java index db2b199bb9c0abc285319b99ceda4e5571b4063d..75a99b5cf148aa55738827082149b809966e6851 100644 --- a/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/RequestHandlerDispatcher.java +++ b/openbis-ipad/source/java/ch/systemsx/cisd/openbis/ipad/v2/server/RequestHandlerDispatcher.java @@ -149,6 +149,10 @@ public class RequestHandlerDispatcher protected RequestType tryRequestType(Map<String, Object> parameters) { String requestKey = (String) parameters.get("requestKey"); + if (null == requestKey) + { + return null; + } RequestType requestType; try { @@ -162,6 +166,10 @@ public class RequestHandlerDispatcher protected IRequestHandlerFactory getHandlerFactory(RequestType requestType) { + if (null == requestType) + { + return emptyDataRequestHandlerFactory; + } IRequestHandlerFactory handlerFactory; switch (requestType) { diff --git a/openbis-ipad/source/objc/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/source/objc/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index bcc4d5432ec30b74b574185ba13de64d762d94b8..190a8d6a5280e1750d429bf5d2bcbb4c2d0efc89 100644 Binary files a/openbis-ipad/source/objc/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/source/objc/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/openbis-ipad/source/objc/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/source/objc/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index ba1e115369a4b2cd7b4fd8a6dc5cfbbc97d07dae..80f19f774dc24f2636224863e1fe98139b407ec4 100644 Binary files a/openbis-ipad/source/objc/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/source/objc/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ