perfsonar development work

Author: trzaszcz
Date: 2009-07-27 09:32:06 -0400 (Mon, 27 Jul 2009)
New Revision: 5236

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
Log:
lsTTL parameter size limitation

Modified: branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml  
2009-07-27 07:58:55 UTC (rev 5235)
+++ branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml  
2009-07-27 13:32:06 UTC (rev 5236)
@@ -38,7 +38,7 @@
                 
value="org.perfsonar.service.lookupservice.LSRegisterServiceEngine"/>  
         <option name="authN" value="no" />
         <option name="minTTL" value="10" />
-        <option name="maxTTL" value="1000000000000" />
+        <option name="maxTTL" value="100000000" />
       </message>     
       
       <!-- QUERY -->

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-07-27 07:58:55 UTC (rev 5235)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-07-27 13:32:06 UTC (rev 5236)
@@ -66,7 +66,7 @@
                                if (getClientTTL() != 0) {
                                        if (getTtlBound() != null) {
                                                logger.info("TTL parameters 
are set");
-                                               logger.info("suggested TTL 
param by service :"
+                                               logger.info("suggested TTL 
param by client :"
                                                                + 
getClientTTL());
                                                if (getClientTTL() <= 
getTtlBound()[1]
                                                                && 
getClientTTL() >= getTtlBound()[0]) {

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2009-07-27 07:58:55 UTC (rev 5235)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2009-07-27 13:32:06 UTC (rev 5236)
@@ -37,7 +37,7 @@
        private final static String MESSAGE_HANDLER = "LSRegisterRequest";
 
        protected LsTTLParameterStatus ttlParameterStatus = 
LsTTLParameterStatus.NONE;
-       private final long[] ttlBound;
+       private final int[] ttlBound;
        private long clientTTL;
 
        protected LSRegisterServiceHelper() throws PerfSONARException {
@@ -110,24 +110,24 @@
         * @param msg
         *            - service configuration payload
         */
-       private long[] getTTLParameters(
+       private int[] getTTLParameters(
                        org.perfsonar.base2.service.configuration.Message msg)
                        throws PerfSONARException {
                String strMinTTL = msg.getOption("minTTL").getValue();
                String strMaxTTL = msg.getOption("maxTTL").getValue();
 
-               long[] result = new long[2];
+               int[] result = new int[2];
 
                if (strMinTTL != null && strMaxTTL != null) {
                        try {
-                               result[0] = Long.parseLong(strMinTTL);
+                               result[0] = Integer.parseInt(strMinTTL);
                        } catch (Exception ex) {
                                throw new PerfSONARException(
                                                "incorrect value of minTTL 
parameter", ex);
                        }
 
                        try {
-                               result[1] = Long.parseLong(strMaxTTL);
+                               result[1] = Integer.parseInt(strMaxTTL);
                        } catch (Exception ex) {
                                throw new PerfSONARException(
                                                "incorrect value of maxTTL 
parameter ", ex);
@@ -335,7 +335,7 @@
                return key;
        }
 
-       protected long[] getTtlBound() {
+       protected int[] getTtlBound() {
                return ttlBound;
        }