Commit emails of the iDok project

["AFS account Roman Geus" <geus AT savannah.psi.ch>]

Author: geus
Date: Mon Mar  3 16:36:57 2008
New Revision: 18

Log:
Fixed IDO-159: Eliminated CORBA null parameter in 
ClientHandlerServiceImpl.getCredentials()

Modified:
   
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
   
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java

Modified: 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
==============================================================================
--- 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
 (original)
+++ 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
 Mon Mar  3 16:36:57 2008
@@ -80,6 +80,9 @@
          */
         try {
             LocalClientHandler localHandler = new LocalClientHandler();
+            // Transform empty string back to null value (see 
CorbaClientHandler.getCredentials())
+            if (serviceName.equals(""))
+                serviceName = null;
             DmsCredentials cred = localHandler.getCredentials(kind,
                     serviceName, realm);
             return CredentialsConverter.toCorba(cred);

Modified: 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java
==============================================================================
--- 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java 
      (original)
+++ 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java 
      Mon Mar  3 16:36:57 2008
@@ -54,6 +54,9 @@
     public DmsCredentials getCredentials(String kind, String serviceName, 
String realm)
             throws DmsException {
         try {
+            // null is an illegal CORBA value: replace by empty string
+            if (serviceName == null)
+                serviceName = "";
             CredentialsType cred = service_.getCredentials(kind,
                     serviceName, realm);
             return CredentialsConverter.fromCorba(cred);