From e9bb60be43af477f17b30ee1f2ba205565b7fa15 Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Mon, 19 Oct 2015 10:14:31 -0700
Subject: Updated onos src tree to commit id
1e60f97ae50c05b94fcb6a10520738bfb5efdfd1
---
framework/src/onos/utils/misc/src/main/java/org/onlab/packet/IGMP.java | 2 +-
framework/src/onos/utils/stc/src/main/java/org/onlab/stc/Compiler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'framework/src/onos/utils')
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";
--
cgit