From: Roland Haeder <roland@mxchange.org>
Date: Fri, 23 Oct 2015 16:34:03 +0000 (+0200)
Subject: added check for addressbookController.addressbook to prevent ugly NPE
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bbdff21af90333d45eef577bc4b0388962f14b62;p=addressbook-war.git

added check for addressbookController.addressbook to prevent ugly NPE
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 82562c28..929c67e5 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -266,3 +266,4 @@ LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben.
 USER_NOT_LOGGED_IN=Sie sind nicht angemeldet.
 LOGIN_OWN_PROFILE_INVISIBLE=Ihr Profil ist auf "durchsichtig" gestellt.
 ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt.
+LOGIN_ADDRESSBOOK_NOT_SET=Adressbuch-Instanz nicht gesetzt.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 8d1678c3..9e7e0cb1 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -261,3 +261,4 @@ LOGIN_NO_USER_NAME_MESSAGE=You have entered no user name.
 USER_NOT_LOGGED_IN=You are not signed in.
 LOGIN_OWN_PROFILE_INVISIBLE=Your profile is set to "invisible".
 ERROR_USER_INSTANCE_NOT_SET=Error: User instance not set.
+LOGIN_ADDRESSBOOK_NOT_SET=Address book instance not set.
diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml
index 7135ba12..d405ac8d 100644
--- a/web/login/login_start_sharing_addressbook.xhtml
+++ b/web/login/login_start_sharing_addressbook.xhtml
@@ -23,7 +23,7 @@
 				<div class="para">
 					<h:outputText id="ownProfileInvisible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
 
-					<h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}">
+					<h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{loginController.isUserLoggedIn() and not empty addressbookController.addressbook and not loginController.isInvisible()}">
 						<c:set value="#{user}" target="#{profileController}" property="user" />
 						<h:column>
 							<f:facet name="header">#{msg.USER_ID}</f:facet>
@@ -43,7 +43,9 @@
 						</h:column>
 					</h:dataTable>
 
-					<h:outputText id="ownProfileInvisible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}" />
+					<h:outputText id="addressbokUnset" class="notice" value="#{msg.LOGIN_ADDRESSBOOK_NOT_SET}" rendered="#{empty addressbookController.addressbook}" />
+
+					<h:outputText id="ownProfileInvisible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and not empty addressbookController.addressbook and not loginController.isInvisible()}" />
 				</div>
 
 				<div class="table_footer">