Author: sergeyb Date: Thu Jun 27 09:02:15 2013 New Revision: 1497254 URL: http://svn.apache.org/r1497254 Log: Merged revisions 1497253 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1497253 | sergeyb | 2013-06-27 09:59:48 +0100 (Thu, 27 Jun 2013) | 16 lines Merged revisions 1497249 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1497249 | sergeyb | 2013-06-27 09:53:55 +0100 (Thu, 27 Jun 2013) | 9 lines Merged revisions 1497246 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1497246 | sergeyb | 2013-06-27 09:50:49 +0100 (Thu, 27 Jun 2013) | 1 line [CXF-5092] Making sure the exception is not lost in case of the validation error ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1497249 Merged /cxf/trunk:r1497246 Merged /cxf/branches/2.6.x-fixes:r1497253 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java?rev=1497254&r1=1497253&r2=1497254&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java (original) +++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java Thu Jun 27 09:02:15 2013 @@ -109,8 +109,8 @@ public final class OAuthUtils { } catch (Exception ex) { if (token != null) { provider.removeToken(token); - throw ex; } + throw ex; } if (token != null && validator instanceof DefaultOAuthValidator) { ((DefaultOAuthValidator)validator).validateToken(token, provider);
