svnno****@sourc*****
svnno****@sourc*****
2008年 11月 20日 (木) 15:09:43 JST
Revision: 1378
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1378
Author: shinsuke
Date: 2008-11-20 15:09:43 +0900 (Thu, 20 Nov 2008)
Log Message:
-----------
checked NPE, and throws an exception.
Modified Paths:
--------------
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/ConfigAction.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/GroupInfoAction.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/RoleInfoAction.java
userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java
-------------- next part --------------
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/ConfigAction.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/ConfigAction.java 2008-11-20 00:00:58 UTC (rev 1377)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/ConfigAction.java 2008-11-20 06:09:43 UTC (rev 1378)
@@ -53,6 +53,9 @@
SAStrutsUtil.addMessage(request, "success.update_config");
return displayIndex();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (ConfigurationException e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException("errors.failed_to_update_config");
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/GroupInfoAction.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/GroupInfoAction.java 2008-11-20 00:00:58 UTC (rev 1377)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/GroupInfoAction.java 2008-11-20 06:09:43 UTC (rev 1378)
@@ -198,6 +198,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -216,6 +219,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -234,6 +240,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -259,6 +268,12 @@
GroupInfo groupInfo;
if (groupInfoForm.mode == CommonConstants.EDIT_MODE) {
groupInfo = groupInfoService.getGroupInfo(groupInfoForm.groupId);
+ if (groupInfo == null) {
+ // throw an exception
+ throw new ActionMessagesException(
+ "errors.could_not_find_groupInfo",
+ new Object[] { groupInfoForm.groupId });
+ }
groupInfo.setUpdatedBy(request.getRemoteUser());
} else {
groupInfo = new GroupInfo();
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/RoleInfoAction.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/RoleInfoAction.java 2008-11-20 00:00:58 UTC (rev 1377)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/RoleInfoAction.java 2008-11-20 06:09:43 UTC (rev 1378)
@@ -198,6 +198,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -216,6 +219,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -234,6 +240,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -257,6 +266,12 @@
RoleInfo roleInfo;
if (roleInfoForm.mode == CommonConstants.EDIT_MODE) {
roleInfo = roleInfoService.getRoleInfo(roleInfoForm.roleId);
+ if (roleInfo == null) {
+ // throw an exception
+ throw new ActionMessagesException(
+ "errors.could_not_find_roleInfo",
+ new Object[] { roleInfoForm.roleId });
+ }
roleInfo.setUpdatedBy(request.getRemoteUser());
} else {
roleInfo = new RoleInfo();
Modified: userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java
===================================================================
--- userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java 2008-11-20 00:00:58 UTC (rev 1377)
+++ userinfo/trunk/src/main/java/jp/sf/pal/userinfo/action/UserInfoAction.java 2008-11-20 06:09:43 UTC (rev 1378)
@@ -207,6 +207,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -225,6 +228,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -243,6 +249,9 @@
loadListPageParameters();
return displayList();
+ } catch (ActionMessagesException e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new ActionMessagesException(
@@ -370,6 +379,12 @@
UserInfo userInfo;
if (userInfoForm.mode == CommonConstants.EDIT_MODE) {
userInfo = userInfoService.getUserInfo(userInfoForm.userId);
+ if (userInfo == null) {
+ // throw an exception
+ throw new ActionMessagesException(
+ "errors.could_not_find_userInfo",
+ new Object[] { userInfoForm.userId });
+ }
userInfo.setUpdatedBy(request.getRemoteUser());
} else {
userInfo = new UserInfo();