From ddd803e73a4519132ce2257c621b54d004f2235f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 19 Dec 2013 07:41:42 +0100
Subject: BugFix: NullPointerException

---
 id/ConfigWebTool/.classpath                                           | 1 +
 .../gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/.classpath b/id/ConfigWebTool/.classpath
index 5bde2110d..0e6d0b69f 100644
--- a/id/ConfigWebTool/.classpath
+++ b/id/ConfigWebTool/.classpath
@@ -26,6 +26,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
index b153e02a8..3d2e35ec5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
@@ -34,14 +34,14 @@ public class OAOAuth20Config {
 			this.clientId = dbOAConfig.getPublicURLPrefix();
 			
 			// validate secret
-			if (StringUtils.isNotEmpty(config.getOAuthClientSecret())) {
+			if (config != null && StringUtils.isNotEmpty(config.getOAuthClientSecret())) {
 				this.clientSecret = config.getOAuthClientSecret();
 			} else {
 				this.generateClientSecret();
 			}
 			
 			// validate redirectUri
-			if (StringUtils.isNotEmpty(config.getOAuthRedirectUri()) && OAuth20Util.isUrl(config.getOAuthRedirectUri())) {
+			if (config != null && StringUtils.isNotEmpty(config.getOAuthRedirectUri()) && OAuth20Util.isUrl(config.getOAuthRedirectUri())) {
 				this.redirectUri = config.getOAuthRedirectUri();
 			} else {
 				errors.add(LanguageHelper.getErrorString("error.oa.oauth.redirecturi"));
-- 
cgit v1.2.3