jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import java.lang.reflect.Type;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import javax.xml.bind.JAXBElement;
 elementLocalNames.add(localName);
 }
 QName qname = new QName(namespace, localName);
 if (field.getType().equals(JAXBElement.class)) {
-Class elementDeclaredType = Object.class;
 if (field.getGenericType() instanceof ParameterizedType) {
 Type arg = ((ParameterizedType) field.getGenericType())
 .getActualTypeArguments()[0];
 if (arg instanceof Class) {
 elementDeclaredTypesByQName.put(qname, (Class) arg);
 }
 static protected List<Field> getAllFields(Class<?> clz) {
 List<Field> list = new ArrayList<Field>();
 while (!Object.class.equals(clz)) {
-for (Field f : getDeclaredFields(clz)) list.add(f);
+list.addAll(Arrays.asList(getDeclaredFields(clz)));
 clz = clz.getSuperclass();
 }
 return list;
 }
 static protected Field[] getDeclaredFields(final Class<?> clz) {
 try {
 return (System.getSecurityManager() == null) ? clz .getDeclaredFields() :
 AccessController.doPrivileged(new PrivilegedExceptionAction<Field[]>() {
+@Override
 public Field[] run() throws IllegalAccessException {
 return clz.getDeclaredFields();
 }
 });
 } catch (PrivilegedActionException e) {
 static protected PropertyGetter createPropertyGetter(Field field, Method getMethod) {
 if (!field.isAccessible()) {
 if (getMethod != null) {
 MethodGetter methodGetter = new MethodGetter(getMethod);
-if (!methodGetter.getType().toString().equals(field.getType().toString())) {
+if (methodGetter.getType().toString().equals(field.getType().toString())) {
-methodGetter = null;
-} else {
 return methodGetter;
 }
 }
 }
 return new FieldGetter(field);
 static protected PropertySetter createPropertySetter(Field field,
 Method setter) {
 if (!field.isAccessible()) {
 if (setter != null) {
 MethodSetter injection = new MethodSetter(setter);
-if (!injection.getType().toString().equals(field.getType().toString())) {
+if (injection.getType().toString().equals(field.getType().toString())) {
-injection = null;
-} else {
 return injection;
 }
 }
 }
 return new FieldSetter(field);
 Object key = (this.elementLocalNameCollision) ? name : name
 .getLocalPart();
 return elementDeclaredTypes.get(key);
 }
+@Override
 public PropertyAccessor getPropertyAccessor(String ns, String name) {
 final QName n = new QName(ns, name);
 final PropertySetter setter = getPropertySetter(n);
 final PropertyGetter getter = getPropertyGetter(n);
 final boolean isJAXBElement = setter.getType()
 final boolean isListType = java.util.List.class.isAssignableFrom(setter
 .getType());
 final Class elementDeclaredType = isJAXBElement ? getElementDeclaredType(n)
 : null;
 return new PropertyAccessor() {
+@Override
 public Object get(Object bean) throws DatabindingException {
-Object val = null;
+Object val;
 if (isJAXBElement) {
 JAXBElement<Object> jaxbElement = (JAXBElement<Object>) getter.get(bean);
 val = (jaxbElement == null) ? null : jaxbElement.getValue();
 } else {
 val = getter.get(bean);
 set(bean, val);
 }
 return val;
 }
+@Override
 public void set(Object bean, Object value) throws DatabindingException {
 if (isJAXBElement) {
 JAXBElement<Object> jaxbElement = new JAXBElement<Object>(
 n, elementDeclaredType, contentClass, value);
 setter.set(bean, jaxbElement);

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java

src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java