aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-12-19 07:41:42 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-12-19 07:41:42 +0100
commitddd803e73a4519132ce2257c621b54d004f2235f (patch)
tree3d661a6363a4082be8fabb4684c30cfac4c649a1 /id/ConfigWebTool
parent3546cafb4942247edf298996186fcdfa32eb9954 (diff)
downloadmoa-id-spss-ddd803e73a4519132ce2257c621b54d004f2235f.tar.gz
moa-id-spss-ddd803e73a4519132ce2257c621b54d004f2235f.tar.bz2
moa-id-spss-ddd803e73a4519132ce2257c621b54d004f2235f.zip
BugFix: NullPointerException
Diffstat (limited to 'id/ConfigWebTool')
-rw-r--r--id/ConfigWebTool/.classpath1
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java4
2 files changed, 3 insertions, 2 deletions
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"));