Minor fixes/improvements

Author: peter-lawrey

lang/src/main/java/net/openhft/lang/collection/impl/HugeArrayImpl.java

@@ -48,7 +48,7 @@ public HugeArrayImpl(DataValueGenerator valueGenerator, Class<T> tClass, long le
 
  T ref = valueGenerator.nativeInstance(tClass);
  size = ((Byteable) ref).maxSize();
- store = new DirectStore(null, length * size);
+ store = new DirectStore(length * size);
  ((Byteable) ref).bytes(store.createSlice());
  recycle(ref);
  }

lang/src/main/java/net/openhft/lang/io/DirectStore.java

@@ -30,6 +30,10 @@ public class DirectStore {
  protected long address;
  protected long size;
 
+ public DirectStore(long size) {
+ this(null, size);
+ }
+
  public DirectStore(BytesMarshallerFactory bytesMarshallerFactory, long size) {
  this.bytesMarshallerFactory = bytesMarshallerFactory;
  address = NativeBytes.UNSAFE.allocateMemory(size);
@@ -51,7 +55,7 @@ public void run() {
 
  @Nullable
  public static DirectStore allocate(long size) {
- return new DirectStore(null, size);
+ return new DirectStore(size);
  }
 
 /* public void resize(long newSize) {

lang/src/test/java/net/openhft/lang/io/serialization/RawCopierTest.java

@@ -54,7 +54,7 @@ public void testStartEnd() {
 
  @Test
  public void testReadWrite() {
- DirectStore ds = new DirectStore(null, 1024);
+ DirectStore ds = new DirectStore(1024);
  DirectBytes db = ds.createSlice();
  RawCopier<A> aRawCopier = RawCopier.copies(A.class);
  A a = new A();

lang/src/test/java/net/openhft/lang/osgi/OSGiBundleTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.openhft.chronicle.osgi;
+package net.openhft.lang.osgi;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -47,15 +47,15 @@ public Option[] config() {
  root.setLevel(Level.INFO);
 
  return options(
- systemProperty("org.osgi.framework.storage.clean").value("true"),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"),
- mavenBundle("net.openhft", "compiler", "2.1"),
- bundle("reference:file:target/classes"),
- junitBundles(),
- systemPackage("sun.misc"),
- systemPackage("sun.nio.ch"),
- systemPackage("com.sun.tools.javac.api"),
- cleanCaches()
+  systemProperty("org.osgi.framework.storage.clean").value("true"),
+  systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"),
+  mavenBundle("net.openhft", "compiler", "2.1"),
+  mavenBundle("net.openhft", "lang", "6.1"),
+  junitBundles(),
+  systemPackage("sun.misc"),
+  systemPackage("sun.nio.ch"),
+  systemPackage("com.sun.tools.javac.api"),
+  cleanCaches()
  );
  }
 

lang/src/test/java/net/openhft/lang/osgi/OSGiCollectionTest.java

@@ -18,25 +18,23 @@
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
+import net.openhft.lang.collection.HugeArray;
+import net.openhft.lang.collection.HugeCollections;
+import net.openhft.lang.model.JavaBeanInterface;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import java.io.File;
 
 import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.*;
 
-import net.openhft.lang.model.JavaBeanInterface;
-import net.openhft.lang.collection.HugeArray;
-import net.openhft.lang.collection.HugeCollections;
-
 /**
  * @author lburgazzoli
  */
@@ -51,15 +49,15 @@ public Option[] config() {
  root.setLevel(Level.INFO);
 
  return options(
- systemProperty("org.osgi.framework.storage.clean").value("true"),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"),
- mavenBundle("net.openhft", "compiler", "2.1"),
- bundle("reference:file:target/classes"),
- junitBundles(),
- systemPackage("sun.misc"),
- systemPackage("sun.nio.ch"),
- systemPackage("com.sun.tools.javac.api"),
- cleanCaches()
+  systemProperty("org.osgi.framework.storage.clean").value("true"),
+  systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"),
+  mavenBundle("net.openhft", "compiler", "2.1"),
+  new File("Java-Lang/lang/target/classes").exists() ? bundle("reference:file:Java-Lang/lang/target/classes") : bundle("reference:file:target/classes"),
+  junitBundles(),
+  systemPackage("sun.misc"),
+  systemPackage("sun.nio.ch"),
+  systemPackage("com.sun.tools.javac.api"),
+  cleanCaches()
  );
  }