[jackson-jaxrs-providers] 90/162: Fix #31

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit 7fff7ce1a55f4105fe6c566e153a17b09f3c957e
Author: Tatu Saloranta <tsaloranta at salesforce.com>
Date:   Tue Oct 1 14:54:34 2013 -0700

    Fix #31
---
 .../jackson/jaxrs/util/EndpointAsBeanProperty.java      |  2 +-
 smile/pom.xml                                           |  1 +
 xml/pom.xml                                             | 17 ++---------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/util/EndpointAsBeanProperty.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/EndpointAsBeanProperty.java
index e487e64..530809b 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/util/EndpointAsBeanProperty.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/util/EndpointAsBeanProperty.java
@@ -29,7 +29,7 @@ public class EndpointAsBeanProperty
         super(ENDPOINT_NAME, type, /*PropertyName wrapperName*/ null,
                 null, null,
                 /* isRequired */ false);
-        boolean hasAnn = (annotations == null || annotations.length == 0);
+        boolean hasAnn = (annotations != null && annotations.length > 0);
         if (hasAnn) {
             _annotations = new AnnotationMap();
             for (Annotation a : annotations) {
diff --git a/smile/pom.xml b/smile/pom.xml
index 8cd9e5b..dd0db72 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -48,6 +48,7 @@
 ,com.fasterxml.jackson.databind.introspect
 ,com.fasterxml.jackson.databind.type
 ,com.fasterxml.jackson.databind.util
+,com.fasterxml.jackson.dataformat.smile
 ,com.fasterxml.jackson.jaxrs.base
 ,com.fasterxml.jackson.jaxrs.cfg
 ,com.fasterxml.jackson.module.jaxb;resolution:=optional
diff --git a/xml/pom.xml b/xml/pom.xml
index 9ba4b66..e8b1387 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- |  Copyright 2012 FasterXML.com
- |
- |  Licensed under the Apache License, Version 2.0 (the "License");
- |  you may not use this file except in compliance with the License.
- |  You may obtain a copy of the License at
- |
- |  http://www.apache.org/licenses/LICENSE-2.0
- |
- |  Unless required by applicable law or agreed to in writing, software
- |  distributed under the License is distributed on an "AS IS" BASIS,
- |  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- |  See the License for the specific language governing permissions and
- |  limitations under the License.
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion> 
@@ -48,6 +33,8 @@
 ,com.fasterxml.jackson.databind.introspect
 ,com.fasterxml.jackson.databind.type
 ,com.fasterxml.jackson.databind.util
+,com.fasterxml.jackson.dataformat.xml
+,com.fasterxml.jackson.dataformat.xml.jaxb
 ,com.fasterxml.jackson.jaxrs.base
 ,com.fasterxml.jackson.jaxrs.cfg
 ,com.fasterxml.jackson.module.jaxb;resolution:=optional

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git