Cleanup

Author: jamo

.travis.yml

@@ -1,10 +1,14 @@
-sudo: false
+sudo: required
+dist: trusty
+
 language: java
 jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
 
+env:
+  - ANT_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
 cache:
   directories:
     - $HOME/.m2
@@ -20,7 +24,7 @@ before_script:
   - cd maven-wrapper/ && mvn -q install && cd ..
 
 script:
-  - ant -Dcontinue.after.failing.tests=true -Dnbplatform.nb81.netbeans.dest.dir=$PWD/netbeans -Dnbplatform.nb81.harness.dir=$PWD/netbeans/harness test
+  - ant -Dcontinue.after.failing.tests=true -Dnbplatform.nb81.netbeans.dest.dir=$PWD/netbeans -Dnbplatform.nb81.harness.dir=$PWD/netbeans/harness -Dfork=on test
 
 notifications:
   slack:

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/HostInformationGenerator.java

@@ -31,7 +31,7 @@ public String updateHostInformation(EventReceiver receiver) {
         LoggableEvent event
                 = new LoggableEvent(
                         "host_information_update",
-                        data.toString().getBytes(Charset.forName("UTF-8")));
+                        data.toString().getBytes(UTF8));
         receiver.receiveEvent(event);
 
         return hostId;
@@ -40,14 +40,6 @@ public String updateHostInformation(EventReceiver receiver) {
     private static JsonMaker getStaticHostInformation() {
         JsonMaker builder = JsonMaker.create();
 
-        try {
-            InetAddress localMachine = java.net.InetAddress.getLocalHost();
-            builder.add("hostAddress", localMachine.getHostAddress());
-            builder.add("hostName", localMachine.getHostName());
-        } catch (Exception ex) {
-            log.log(Level.WARNING, "Exception while getting host name information: {0}", ex);
-        }
-
         try {
             Enumeration<NetworkInterface> iterator = NetworkInterface.getNetworkInterfaces();
             List<String> macs = new ArrayList<String>(2);
@@ -124,5 +116,5 @@ private static String byteToHex(byte[] bytes) {
         }
         return sb.toString();
     }
-
 }
+