idok-commit AT lists.psi.ch

Subject: Commit emails of the iDok project

List archive

[idok-commit] idok commit r672 - branches/opensource/java/ch/psi/dms/service/server/admin/corba

From: "Apache" <apache AT savannah.psi.ch>
To: idok-commit AT lists.psi.ch
Subject: [idok-commit] idok commit r672 - branches/opensource/java/ch/psi/dms/service/server/admin/corba
Date: Mon, 7 Jan 2008 14:22:15 +0100
List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>

Author: geus AT PSI.CH
Date: Mon Jan 7 14:22:15 2008
New Revision: 672

Log:
Fixed NullPointerException occurring in AdminServiceImpl.initAuthDb if
invalid credentials were passed

Modified:

branches/opensource/java/ch/psi/dms/service/server/admin/corba/AdminServiceImpl.java

Modified:
branches/opensource/java/ch/psi/dms/service/server/admin/corba/AdminServiceImpl.java
==============================================================================
---
branches/opensource/java/ch/psi/dms/service/server/admin/corba/AdminServiceImpl.java
(original)
+++
branches/opensource/java/ch/psi/dms/service/server/admin/corba/AdminServiceImpl.java
Mon Jan 7 14:22:15 2008
@@ -137,13 +137,14 @@
try {
logger_.info("initAuthDB() called by " + cred.username);
DmsCredentials creds = CredentialsConverter.fromCorba(cred);
- String authUser = AuthUtil.getStrippedName(AuthUtil
- .getUserPrincipal(AuthUtil.authenticate(creds)));
- if (authUser == null) {
+ Subject subject = AuthUtil.authenticate(creds);
+ if (subject == null) {
logger_.finer("Could not authenticate to admin service");
throw Util.toServiceException(ExceptionType.AUTH,
"Could not authenticate to admin service");
}
+ String authUser = AuthUtil.getStrippedName(AuthUtil
+ .getUserPrincipal(subject));
if (!(masterAdminName_.equals(authUser))) {
logger_
.finer(authUser

[idok-commit] idok commit r672 - branches/opensource/java/ch/psi/dms/service/server/admin/corba, Apache, 01/07/2008