commit 794754acebd0c42e581deddf3b794129d7857f73
author Tatu Saloranta <tsaloranta@gmail.com> Sun Sep 09 18:48:41 2012 -0700
committer Tatu Saloranta <tsaloranta@gmail.com> Sun Sep 09 18:48:41 2012 -0700
tree d00c384d9847c35b0e2de2d02fc923078883a603
parent 355d9bd0986e43ff84dabdc520ee9fa471559b09

Fix a minor bug in introspector pair

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
index f1bf6f3..cb7cd51 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
@@ -432,7 +432,7 @@
         } else if (name == PropertyName.USE_DEFAULT) {
             // does the other introspector have a better idea?
             PropertyName name2 = _secondary.findWrapperName(ann);
-            if (name2 != name) {
+            if (name2 != null) {
                 name = name2;
             }
         }