You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/25 08:42:05 UTC

svn commit: r479100 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java

Author: jmarino
Date: Fri Nov 24 23:42:04 2006
New Revision: 479100

URL: http://svn.apache.org/viewvc?view=rev&rev=479100
Log:
make millisecond calculations for conversation timeouts accurate

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java?view=diff&rev=479100&r1=479099&r2=479100
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java Fri Nov 24 23:42:04 2006
@@ -218,17 +218,17 @@
         i = expr.lastIndexOf(HOURS);
         if (i >= 0) {
             String units = expr.substring(0, i);
-            return Long.parseLong(units) * 60000 * 60;
+            return Long.parseLong(units) * 3600000;
         }
         i = expr.lastIndexOf(DAYS);
         if (i >= 0) {
             String units = expr.substring(0, i);
-            return Long.parseLong(units) * 60000 * 60 * 24;
+            return Long.parseLong(units) * 86400000;
         }
         i = expr.lastIndexOf(YEARS);
         if (i >= 0) {
             String units = expr.substring(0, i);
-            return Long.parseLong(units) * 60000 * 60 * 24 * 365;  // not really accurate but good enough
+            return Long.parseLong(units) * 31556926000L;
         }
         return Long.parseLong(expr) * 1000;  // assume seconds if no suffix specified
     }

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java?view=diff&rev=479100&r1=479099&r2=479100
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java Fri Nov 24 23:42:04 2006
@@ -71,8 +71,8 @@
     }
 
     public void testConvertYears() throws Exception {
-        assertEquals(315360000000L, registy.convertTimeMillis("10 years"));
-        assertEquals(315360000000L, registy.convertTimeMillis("10 YEARS"));
+        assertEquals(315569260000L, registy.convertTimeMillis("10 years"));
+        assertEquals(315569260000L, registy.convertTimeMillis("10 YEARS"));
         try {
             registy.convertTimeMillis("10years");
             fail();



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org