svn commit: r1562026 - in /cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso: AbstractSSOSpHandler.java AbstractServiceProviderFilter.java RequestAssertionConsumerService.java

[sergeyb]

Author: sergeyb
Date: Tue Jan 28 10:35:27 2014
New Revision: 1562026

URL: http://svn.apache.org/r1562026
Log:
[CXF-5529] Removing IOException throw clause from some of SAML SSO handlers

Modified:
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java?rev=1562026&r1=1562025&r2=1562026&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 Tue Jan 28 10:35:27 2014
@@ -56,9 +56,13 @@ public class AbstractSSOSpHandler {
     }
     
     @PreDestroy
-    public void close() throws IOException {
+    public void close() {
         if (stateProvider != null) {
-            stateProvider.close();
+            try {
+                stateProvider.close();
+            } catch (IOException ex) {
+                LOG.warning("State provider can not be closed: " + 
ex.getMessage());
+            }
             stateProvider = null;
         }
     }

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java?rev=1562026&r1=1562025&r2=1562026&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 Tue Jan 28 10:35:27 2014
@@ -128,10 +128,8 @@ public abstract class AbstractServicePro
     }
     
     @PreDestroy
-    public void close() throws IOException {
-        if (getStateProvider() != null) {
-            getStateProvider().close();
-        }
+    public void close() {
+        super.close();
     }
     
     private String getIssuerId(Message m) {

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java?rev=1562026&r1=1562025&r2=1562026&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
 Tue Jan 28 10:35:27 2014
@@ -140,9 +140,13 @@ public class RequestAssertionConsumerSer
     
     @PreDestroy
     @Override
-    public void close() throws IOException {
+    public void close() {
         if (replayCache != null) {
-            replayCache.close();
+            try {
+                replayCache.close();
+            } catch (IOException ex) {
+                LOG.warning("Replay cache can not be closed: " + 
ex.getMessage());
+            }
         }
         super.close();
     }