diff options
| author |   Ashlee Young <ashlee@onosfw.com> | 2015-10-19 10:14:31 -0700 |
|---|---|---|
| committer | Ashlee Young <ashlee@onosfw.com> | 2015-10-19 10:14:31 -0700 |
| commit | e9bb60be43af477f17b30ee1f2ba205565b7fa15 (patch) | |
| tree | 981fd759a44b751fc45cde774f46fda37c11c257 /framework/src/onos/utils | |
| parent | 74f3941756a1386cbc1fa99ee73fdc8376a0b6a0 (diff) | |
Updated onos src tree to commit id 1e60f97ae50c05b94fcb6a10520738bfb5efdfd1
Diffstat (limited to 'framework/src/onos/utils')
| -rw-r--r-- | framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java | 2 | ||||
| -rw-r--r-- | framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java b/framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java index e7abbd6a..254f1325 100644 --- a/framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java +++ b/framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java @@ -231,7 +231,7 @@ public class IGMP extends BasePacket { IGMP igmp = new IGMP(); - ByteBuffer bb = ByteBuffer.wrap(data); + final ByteBuffer bb = ByteBuffer.wrap(data, offset, length); igmp.igmpType = bb.get(); igmp.resField = bb.get(); igmp.checksum = bb.getShort(); diff --git a/framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java b/framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java index c2a0c812..add71eb5 100644 --- a/framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java +++ b/framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java @@ -42,7 +42,7 @@ import static org.onlab.stc.Scenario.loadScenario; */ public class Compiler { - private static final String DEFAULT_LOG_DIR = "${env.WORKSPACE}/tmp/stc/"; + private static final String DEFAULT_LOG_DIR = "${WORKSPACE}/tmp/stc/"; private static final String IMPORT = "import"; private static final String GROUP = "group"; |