diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-06-19 10:51:11 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-06-19 10:51:11 +0200 |
| commit | a21e7c925d282fc83efdfb92069d955d8b30dbf4 (patch) | |
| tree | 71d0e016334a64231edc305d00793bd35bc48d0a /src/main | |
| parent | 123db9841af0819a88d10140c96a90fb5d95dfeb (diff) | |
Gateway.connect should throw ObjectNotFoundException if the user doesn't
exist.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/c2kernel/process/Gateway.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/UserCodeProcess.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 2bbe638..b393077 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -256,7 +256,7 @@ public class Gateway * @throws InvalidDataException
*/
static public AgentProxy connect(String agentName, String agentPassword)
- throws InvalidDataException
+ throws InvalidDataException, ObjectNotFoundException
{
LDAPProperties ldapProps = new LDAPProperties();
@@ -289,7 +289,7 @@ public class Gateway } catch (ClusterStorageException e) {
throw new InvalidDataException(Language.translate("Error initialising storage")+Language.translate(". See log."), "");
} catch (ObjectNotFoundException e) {
- throw new InvalidDataException(Language.translate("Invalid username/password"), "");
+ throw new ObjectNotFoundException(Language.translate("Invalid username/password"), "");
} catch (Exception e) {
throw new InvalidDataException(Language.translate("Could not log in")+": "+Language.translate(e.getMessage()), "");
}
diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java index 1c40194..0abd906 100644 --- a/src/main/java/com/c2kernel/process/UserCodeProcess.java +++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java @@ -5,7 +5,6 @@ import java.net.UnknownHostException; import java.util.ArrayList;
import java.util.HashMap;
-import com.c2kernel.common.InvalidDataException;
import com.c2kernel.common.InvalidTransitionException;
import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.agent.Job;
@@ -40,7 +39,7 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv Logger.msg("Login attempt "+i+" of 5");
agent = Gateway.connect(agentName, agentPass);
break;
- } catch (InvalidDataException ex) {
+ } catch (Exception ex) {
Logger.error("Could not log in.");
Logger.error(ex);
try {
|