From: Maros Marsalek Date: Fri, 6 Jun 2014 09:34:44 +0000 (+0200) Subject: BUG-832 Fix rpcResult to xml translation to use schema for get/get-config. X-Git-Tag: release/helium~681^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3109857a685acdebed91b417e2b0bcea1b80f54b BUG-832 Fix rpcResult to xml translation to use schema for get/get-config. The schema was never used since check if rpc qname is get/get-config was performed using == instead of equals. (Result of xtend -> java transform) Change-Id: I057476f27b5c84b87ca9c81c51bde24990d17ff1 Signed-off-by: Maros Marsalek --- diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java index c51009f5d2..1284d6d1ce 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -152,7 +152,7 @@ public class NetconfMessageTransformUtil { } public static boolean isDataRetrievalOperation(final QName rpc) { - return NETCONF_URI == rpc.getNamespace() + return NETCONF_URI.equals(rpc.getNamespace()) && (rpc.getLocalName().equals(NETCONF_GET_CONFIG_QNAME.getLocalName()) || rpc.getLocalName().equals( NETCONF_GET_QNAME.getLocalName())); }