[Jaxme-cvs] JaxMe/src/runtime/de/ispsoft/jaxme/tamino InoSession.java,1.1,1.2 InoResponseHandlerNoNs.java,1.3,1.4 InoManagerNoNs.java,1.3,1.4

[<th...@us...>]

Update of /cvsroot/jaxme/JaxMe/src/runtime/de/ispsoft/jaxme/tamino
In directory sc8-pr-cvs1:/tmp/cvs-serv20851/src/runtime/de/ispsoft/jaxme/tamino

Modified Files:
	InoSession.java InoResponseHandlerNoNs.java 
	InoManagerNoNs.java 
Log Message:
tamino session handling bugfixed

Index: InoSession.java
===================================================================
RCS file: /cvsroot/jaxme/JaxMe/src/runtime/de/ispsoft/jaxme/tamino/InoSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- InoSession.java	12 Jan 2004 18:18:55 -0000	1.1
+++ InoSession.java	13 Jan 2004 12:00:16 -0000	1.2
@@ -40,5 +40,10 @@
     public void setSessionkey(String string) {
         sessionkey = string;
     }
+    
+    public String toString() {
+        return "sessionid: " + ((sessionid == null) ? "null" : sessionid) + "\n" + 
+               "sessionkey: " + ((sessionkey == null) ? "null" : sessionkey) + "\n";
+    }
 
 }

Index: InoResponseHandlerNoNs.java
===================================================================
RCS file: /cvsroot/jaxme/JaxMe/src/runtime/de/ispsoft/jaxme/tamino/InoResponseHandlerNoNs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- InoResponseHandlerNoNs.java	12 Jan 2004 18:18:55 -0000	1.3
+++ InoResponseHandlerNoNs.java	13 Jan 2004 12:00:16 -0000	1.4
@@ -135,19 +135,20 @@
         }
       }
     } else if (level == 0) {
-        if (resultInfo != null && INO_RESPONSE2_URI.equals(namespaceUri) && 
-            "response".equals(localName)) {
+        if (INO_RESPONSE2_URI.equals(namespaceUri) && "response".equals(localName)) {
             cat.debug("Level 0 is response element");
             String sid = attr.getValue(INO_RESPONSE2_URI, "sessionid");
             if(sid != null && sid.length() > 0) {
                 sessionid = sid;
-                resultInfo.putResultInfo("sessionid", sessionid);
+                if(resultInfo != null)
+                    resultInfo.putResultInfo("sessionid", sessionid);
             }
             cat.debug("sessionid: " + sessionid);
             String sk = attr.getValue(INO_RESPONSE2_URI, "sessionkey");
             if(sk != null && sk.length() > 0) {
                 sessionkey = sk;
-                resultInfo.putResultInfo("sessionkey", sessionkey);
+                if(resultInfo != null)
+                    resultInfo.putResultInfo("sessionkey", sessionkey);
             }
             cat.debug("sessionkey: " + sessionkey);
         }

Index: InoManagerNoNs.java
===================================================================
RCS file: /cvsroot/jaxme/JaxMe/src/runtime/de/ispsoft/jaxme/tamino/InoManagerNoNs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- InoManagerNoNs.java	12 Jan 2004 18:18:55 -0000	1.3
+++ InoManagerNoNs.java	13 Jan 2004 12:00:16 -0000	1.4
@@ -573,9 +573,11 @@
     protected void performQueryUseSession(String pQuery, InoResponseHandlerNoNs pHandler,
     InoSession pInoSession) throws SAXException {
         pQuery = appendSession(pQuery, pInoSession);
+        cat.debug("performQueryUseSession pQuery: " + pQuery);
         performQuery(pQuery, pHandler);
         pInoSession.setSessionid(pHandler.getSessionid());
         pInoSession.setSessionkey(pHandler.getSessionkey());
+        cat.debug("performQueryUseSession pInoSession: " + pInoSession);
     }
 
     /** <p>Parses a single INO response document.</p>