Merge branch 'samlengine_update' into moa-2.1-Snapshot

2 files changed, 17 insertions, 5 deletions

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index da78d3dc1..504b0dc84 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -129,7 +129,15 @@
 			<artifactId>moa-common</artifactId>

 			<type>jar</type>

 		</dependency>

-		

+<!--

+        <dependency>

+            <groupId>MOA</groupId>

+            <artifactId>moa-common</artifactId>

+            <type>compile</type>

+        </dependency>

+-->

+

+

 		<dependency>

 			<groupId>MOA</groupId>

 			<artifactId>moa-common</artifactId>

@@ -301,11 +309,10 @@
 						</group>

 					</groups>

 					<links>

-						<link>http://java.sun.com/j2se/1.4/docs/api/</link>

-						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>

+						<link>http://docs.oracle.com/javase/7/docs/api/</link>

 						<link>http://logging.apache.org/log4j/docs/api/</link>

 					</links>

-					<target>1.5</target>

+					<target>1.7</target>

 				</configuration>

 				<executions>

 					<execution>

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
index d1281c1f1..6a85415f8 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
@@ -145,7 +145,12 @@ public class XMLSignatureCreationProfileFactory {
     // get the key group id
     String keyGroupID = request.getKeyIdentifier();
     // get digest method on key group level (if configured)
-    String configDigestMethodKG = config.getKeyGroup(keyGroupID).getDigestMethodAlgorithm();
+    KeyGroup keygroup = config.getKeyGroup(keyGroupID);
+    if(null == keygroup) {
+        Logger.error("Could not find key group '" + keyGroupID + "'");
+        throw new MOAApplicationException("2231", null);
+    }
+    String configDigestMethodKG = keygroup.getDigestMethodAlgorithm();
     // get default digest method (if configured)
     String configDigestMethod = config.getDigestMethodAlgorithmName();