projects / java-idp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dae38b9)
Fix NPE in container-managed loging error page
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 15 Dec 2008 12:48:59 +0000 (12:48 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 15 Dec 2008 12:48:59 +0000 (12:48 +0000)
Bump version number and grab latest version of shib-common

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2822 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

doc/RELEASE-NOTES.txt patch | blob | history
pom.xml patch | blob | history
src/main/webapp/login-error.jsp patch | blob | history

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index ba05621..9dd33f7 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -1,3 +1,9 @@
+Changes in Release 2.1.2
+=============================================
+* Significant memory optimizations
+[SIDP-260] - NPE in login-err.jsp
+
+
 Changes in Release 2.1.1
 =============================================
 [SIDP-248] - Signing code in profile handlers and encoders should not just check that a signing credential is supplied, but that a signing key is available in that credential.
diff --git a/pom.xml b/pom.xml
index 7e278ef..a8aac22 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/src/main/webapp/login-error.jsp b/src/main/webapp/login-error.jsp
index 2cecb63..4af56a6 100644 (file)
--- a/src/main/webapp/login-error.jsp
+++ b/src/main/webapp/login-error.jsp
@@ -9,8 +9,9 @@
 <body>
        <img src="<%= request.getContextPath() %>/images/logo.jpg" />
        <h3>ERROR</h3>
+       <% if (error != null){%>
        Error Message: <%= error.getMessage() %>
-       
+       <% } %>
 </body>
 
 </html>
\ No newline at end of file
Shibboleth 2 Java IdP