Author: kstam
Date: Tue Mar 22 15:24:28 2011
New Revision: 1084214

URL: http://svn.apache.org/viewvc?rev=1084214&view=rev
Log:
JUDDI-463, now returning a real java.util.Date object to avoid issues with 
TimeStamp.

Modified:
    
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java

Modified: 
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=1084214&r1=1084213&r2=1084214&view=diff
==============================================================================
--- 
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
 (original)
+++ 
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
 Tue Mar 22 15:24:28 2011
@@ -329,7 +329,7 @@ public class InquiryHelper {
                        currentIndex = subscriptionStartIndex.value;
 
                int returnedRowCount = 0;
-               logger.info("Period = " + modifiedAfter + " ---- " + 
modifiedBefore);
+               if (logger.isDebugEnabled()) logger.debug("Period = " + 
modifiedAfter + " ---- " + modifiedBefore);
                while (currentIndex < queryResults.size()) {
                        Object item = queryResults.get(currentIndex);
 
@@ -337,20 +337,15 @@ public class InquiryHelper {
                        org.uddi.api_v3.ServiceInfo apiServiceInfo = new 
org.uddi.api_v3.ServiceInfo();
                        
                        logger.info(modelBusinessService.getEntityKey() + " is 
modified " + modelBusinessService.getModifiedIncludingChildren() + " " + 
modelBusinessService.getModifiedIncludingChildren().getTime() );
-                       if (modifiedAfter != null && modifiedAfter.getTime() > 
(modelBusinessService.getModifiedIncludingChildren().getTime())) {
+                       if (modifiedAfter != null && 
modifiedAfter.after(modelBusinessService.getModifiedIncludingChildren())) {
                                currentIndex++;
-                               logger.info(modifiedAfter.getTime() + " " + 
modelBusinessService.getModifiedIncludingChildren().getTime());
-                               logger.info("after");
                                continue;
                        }
                        
-                       if (modifiedBefore != null && modifiedBefore.getTime() 
< (modelBusinessService.getModifiedIncludingChildren().getTime())) {
+                       if (modifiedBefore != null && 
modifiedBefore.before(modelBusinessService.getModifiedIncludingChildren())) {
                                currentIndex++;
-                               logger.info(modifiedBefore.getTime() + " " + 
modelBusinessService.getModifiedIncludingChildren().getTime());
-                               logger.info("before");
                                continue;
                        }
-                       logger.info("keeping");
                        MappingModelToApi.mapServiceInfo(modelBusinessService, 
apiServiceInfo);
                        
                        
result.getServiceInfos().getServiceInfo().add(apiServiceInfo);

Modified: 
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java?rev=1084214&r1=1084213&r2=1084214&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java 
(original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java 
Tue Mar 22 15:24:28 2011
@@ -53,7 +53,11 @@ public abstract class UddiEntity impleme
        @Temporal(TemporalType.TIMESTAMP)
        @Column(name = "created", length = 29)
        public Date getCreated() {
-               return created;
+               if (created!=null) {
+                       return new Date(created.getTime());
+               } else {
+                       return null;
+               }
        }
        public void setCreated(Date created) {
                this.created = created;
@@ -62,7 +66,11 @@ public abstract class UddiEntity impleme
        @Temporal(TemporalType.TIMESTAMP)
        @Column(name = "modified", nullable = false, length = 29)
        public Date getModified() {
-               return this.modified;
+               if (modified!=null) {
+                       return new Date(modified.getTime());
+               } else {
+                       return null;
+               }
        }
        public void setModified(Date modified) {
                this.modified = modified;
@@ -71,7 +79,11 @@ public abstract class UddiEntity impleme
        @Temporal(TemporalType.TIMESTAMP)
        @Column(name = "modified_including_children", length = 29)
        public Date getModifiedIncludingChildren() {
-               return modifiedIncludingChildren;
+               if (modifiedIncludingChildren!=null) {
+                       return new Date(modifiedIncludingChildren.getTime());
+               } else {
+                       return null;
+               }
        }
        public void setModifiedIncludingChildren(Date 
modifiedIncludingChildren) {
                this.modifiedIncludingChildren = modifiedIncludingChildren;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to