perfsonar development work

Author: nordunet.behrmann
Date: 2012-09-11 08:41:41 +0100 (Tue, 11 Sep 2012)
New Revision: 6001

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
Log:
Various array handling fixes

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
 2012-09-11 07:41:39 UTC (rev 6000)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
 2012-09-11 07:41:41 UTC (rev 6001)
@@ -402,12 +402,9 @@
                        
                        String[] newScheduleChain = new 
String[scheduleChain.length+1];
                        // insert it above the current content in chain
+
+                    System.arraycopy(scheduleChain, 0, newScheduleChain, 1, 
scheduleChain.length);
                        
-                       for(int i=0;i<scheduleChain.length;i++) {
-                           
-                           newScheduleChain[i+1] = scheduleChain[i];
-                       }
-                       
                        scheduleChain = null; scheduleChain = 
newScheduleChain;
                        
                        scheduleChain[0]=nextMetadataResults[0];

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
    2012-09-11 07:41:39 UTC (rev 6000)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/IPAddress.java
    2012-09-11 07:41:41 UTC (rev 6001)
@@ -1,5 +1,7 @@
 package org.perfsonar.base.util.iptrie;
 
+import java.util.Arrays;
+
 /**
  * Summarization code
  * 
@@ -61,10 +63,10 @@
                 try {
                     temp = Long.parseLong(aSplitIP);
                 } catch (Exception e) {
-                    throw new InvalidIPAddressException("IP address is not 
valid: "+ip);
+                    throw new InvalidIPAddressException("IP address is not 
valid: "+ Arrays.toString(ip));
                 }
                 if (temp < 0 || temp > 256) {
-                    throw new InvalidIPAddressException("IP address is not 
valid "+ip);
+                    throw new InvalidIPAddressException("IP address is not 
valid "+ Arrays.toString(ip));
                 }
                 ipInLong = (ipInLong << 8) + temp;
             }