You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/12/03 13:31:48 UTC
cxf git commit: Fixing a merge problem
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 6c9dab7e7 -> cdcc51054
Fixing a merge problem
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cdcc5105
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cdcc5105
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cdcc5105
Branch: refs/heads/3.0.x-fixes
Commit: cdcc510544fc9b8ce519410fa0a08245301958b6
Parents: 6c9dab7
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Dec 3 12:31:31 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Dec 3 12:31:31 2014 +0000
----------------------------------------------------------------------
.../cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/cdcc5105/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index f786c28..65cf836 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -199,8 +199,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti
super.setResourceProviders(factories);
}
Class<? extends Annotation> serviceAnnotationClass = loadServiceAnnotationClass();
- try {
- if (basePackages != null) {
+ if (basePackages != null) {
+ try {
@SuppressWarnings("unchecked")
final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes =
ClasspathScanner.findClasses(basePackages, Provider.class, Path.class);