Index: axis/src/webapp/SakaiSigning.jws =================================================================== --- axis/src/webapp/SakaiSigning.jws (revision 903) +++ axis/src/webapp/SakaiSigning.jws (working copy) @@ -96,6 +96,7 @@ } public String testsign(String data) throws AxisFault { + // Session s = establishSession(sessionid); if (!"true".equals(ServerConfigurationService.getString("linktool.enabled", "false"))) @@ -135,10 +136,15 @@ } public String getsession(String object) throws AxisFault { - return getsession(null, object); + return getsessionint(null, object); } - public String getsession(String data, String object) throws AxisFault { + public String getsession2(String data, String object) throws AxisFault { + return getsessionint(data, object); + } + + public String getsessionint(String data, String object) throws AxisFault { + // Session s = establishSession(sessionid); if (!"true".equals(ServerConfigurationService.getString("linktool.enabled", "false"))) @@ -171,10 +177,13 @@ if (!result) throw new AxisFault("failed on session object"); - if (object.equals("currentuser") && data != null) - return makesession(data, "internaluser="); - else - return makesession(object, "user="); + if (object.equals("currentuser") && data != null) { + String ret = makesession(data, "internaluser="); + return ret; + } else { + String ret = makesession(object, "user="); + return ret; + } } @@ -188,13 +197,13 @@ else throw new AxisFault("unabled to find "+attr); } + i = spec.indexOf("&"); if (i > 0) spec = spec.substring(0, i); i = spec.indexOf("="); // has to be there spec = spec.substring(i+1); - User user = null; try{ user = UserDirectoryService.getUser(spec); @@ -238,7 +247,7 @@ Session s = null; String sessionid = decrypt(esession); - System.out.println("session " + sessionid); + // System.out.println("session " + sessionid); if (sessionid != null) s = SessionManager.getSession(sessionid);