svn commit: r1562029 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/

[sergeyb]

Author: sergeyb
Date: Tue Jan 28 10:39:16 2014
New Revision: 1562029

URL: http://svn.apache.org/r1562029
Log:
Merged revisions 1562026 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1562026 | sergeyb | 2014-01-28 10:35:27 +0000 (Tue, 28 Jan 2014) | 1 line
  
  [CXF-5529] Removing IOException throw clause from some of SAML SSO handlers
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
    
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
    
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1562026

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java?rev=1562029&r1=1562028&r2=1562029&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 Tue Jan 28 10:39:16 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/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java?rev=1562029&r1=1562028&r2=1562029&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 Tue Jan 28 10:39:16 2014
@@ -126,10 +126,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/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java?rev=1562029&r1=1562028&r2=1562029&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/RequestAssertionConsumerService.java
 Tue Jan 28 10:39:16 2014
@@ -139,9 +139,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();
     }