svn commit: r1500790 - in /oodt/trunk/commons: pom.xml src/main/java/org/apache/oodt/commons/date/DateUtils.java

[ma...@apache.org]

Author: mattmann
Date: Mon Jul  8 15:10:31 2013
New Revision: 1500790

URL: http://svn.apache.org/r1500790
Log:
Revert OODT-559 for now while magicaltrout investigates; need to roll 0.6 RC #1.

Modified:
    oodt/trunk/commons/pom.xml
    oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java

Modified: oodt/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/commons/pom.xml?rev=1500790&r1=1500789&r2=1500790&view=diff
==============================================================================
--- oodt/trunk/commons/pom.xml (original)
+++ oodt/trunk/commons/pom.xml Mon Jul  8 15:10:31 2013
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oodt</groupId>
     <artifactId>oodt-core</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
   <artifactId>oodt-commons</artifactId>
@@ -29,9 +29,9 @@
   <packaging>jar</packaging>
   <description>Apache OODT Common Utilities Project</description>
   <scm>
-   	<connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</connection>
-   	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</developerConnection>
-   	<url>http://svn.apache.org/viewvc/oodt/trunk/commons</url>
+   	<connection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.6/commons</connection>
+   	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.6/commons</developerConnection>
+   	<url>http://svn.apache.org/viewvc/oodt/tags/0.6/commons</url>
   </scm>
   <build>
     <resources>

Modified: oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java
URL: http://svn.apache.org/viewvc/oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java?rev=1500790&r1=1500789&r2=1500790&view=diff
==============================================================================
--- oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java (original)
+++ oodt/trunk/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java Mon Jul  8 15:10:31 2013
@@ -206,7 +206,7 @@ public class DateUtils {
     }
     
     public static long getTimeInMillis(Calendar cal, Calendar epoch) throws Exception {
-        long epochDiffInMilli = epoch.getTimeInMillis() - (julianEpoch.getTimeInMillis()+julianEpoch.getTimeZone().getOffset(julianEpoch.getTimeInMillis())) ;
+        long epochDiffInMilli = epoch.getTimeInMillis() - julianEpoch.getTimeInMillis() ;
         if (cal.getTimeZone().getID().equals("TAI"))
             epochDiffInMilli += getLeapSecsForDate(epoch) * 1000;
         long milliseconds = cal.getTimeInMillis();