Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Change target to ${project.build.target} in a bunch of pom file. Add some...
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
protocol_plugin
/
openflow
/
vendorextension
/
v6extension
/
V6StatsReply.java
diff --git
a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
index f88efa36a53acaebf1dba5f9564e0c2b2edcf712..3ae19838a2136b2be46fc18df026119fa03eb8a4 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
+++ b/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
@@
-12,9
+12,6
@@
package org.opendaylight.controller.protocol_plugin.openflow.vendorextension.v6e
import java.nio.ByteBuffer;
import java.util.List;
import java.nio.ByteBuffer;
import java.util.List;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.openflow.protocol.action.OFAction;
import org.openflow.protocol.statistics.OFVendorStatistics;
import org.openflow.util.U16;
import org.openflow.protocol.action.OFAction;
import org.openflow.protocol.statistics.OFVendorStatistics;
import org.openflow.util.U16;
@@
-22,9
+19,9
@@
import org.openflow.util.U16;
/**
* This Class processes the OpenFlow Vendor Extension Reply message of a Stats
* Request. It parses the reply message and initializes fields of V6StatsReply
/**
* This Class processes the OpenFlow Vendor Extension Reply message of a Stats
* Request. It parses the reply message and initializes fields of V6StatsReply
- * object. Multiple instances of this class objects are created and used by
+ * object. Multiple instances of this class objects are created and used by
* OpenDaylight's Troubleshooting Application.
* OpenDaylight's Troubleshooting Application.
- *
+ *
*/
public class V6StatsReply extends OFVendorStatistics {
*/
public class V6StatsReply extends OFVendorStatistics {
@@
-299,19
+296,14
@@
public class V6StatsReply extends OFVendorStatistics {
* action list may be preceded by a padding of 0 to 7 bytes based upon this:
*/
short pad_size = (short) (((match_len + 7) / 8) * 8 - match_len);
* action list may be preceded by a padding of 0 to 7 bytes based upon this:
*/
short pad_size = (short) (((match_len + 7) / 8) * 8 - match_len);
- for (i = 0; i < pad_size; i++)
+ for (i = 0; i < pad_size; i++)
{
data.get();
data.get();
+ }
int action_len = this.length - MINIMUM_LENGTH - (match_len + pad_size);
if (action_len > 0)
this.actions = this.actionFactory.parseActions(data, action_len);
}
int action_len = this.length - MINIMUM_LENGTH - (match_len + pad_size);
if (action_len > 0)
this.actions = this.actionFactory.parseActions(data, action_len);
}
- @Override
- public void writeTo(ByteBuffer data) {
- super.writeTo(data);//TBD. This Fn needs work. Should never get called though.
-
- }
-
@Override
public int hashCode() {
final int prime = 31;
@Override
public int hashCode() {
final int prime = 31;