Author: kstam
Date: Thu Jun 2 15:31:16 2011
New Revision: 1130609
URL: http://svn.apache.org/viewvc?rev=1130609&view=rev
Log:
JUDDI-487 fixing the notificationDate (setting it to the endpoint of the
interval)
Modified:
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
Modified:
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java?rev=1130609&r1=1130608&r2=1130609&view=diff
==============================================================================
---
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
(original)
+++
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
Thu Jun 2 15:31:16 2011
@@ -103,7 +103,7 @@ public class SubscriptionNotifierTest
boolean hasChanges =
notifier.resultListContainsChanges(resultList);
Assert.assertTrue(hasChanges);
System.out.print(resultList);
- notifier.notify(getSubscriptionResults,resultList);
+ notifier.notify(getSubscriptionResults,resultList,new Date());
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1130609&r1=1130608&r2=1130609&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
Thu Jun 2 15:31:16 2011
@@ -134,8 +134,9 @@ public class SubscriptionNotifier extend
try {
//build a query with a coverage
period from the lastNotified time to
//now (the scheduled Execution
time)
+ Date notificationDate = new
Date(scheduledExecutionTime());
GetSubscriptionResults
getSubscriptionResults =
-
buildGetSubscriptionResults(subscription, new Date(scheduledExecutionTime()));
+
buildGetSubscriptionResults(subscription, notificationDate);
if
(getSubscriptionResults!=null) {
getSubscriptionResults.setSubscriptionKey(subscription.getSubscriptionKey());
UddiEntityPublisher
publisher = new UddiEntityPublisher();
@@ -143,7 +144,7 @@ public class SubscriptionNotifier extend
SubscriptionResultsList
resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults,
publisher);
if
(resultListContainsChanges(resultList)) {
log.info("We
have a change and need to notify..");
-
notify(getSubscriptionResults,resultList);
+
notify(getSubscriptionResults,resultList, notificationDate);
} else {
log.info("No
changes where recorded, no need to notify.");
}
@@ -287,7 +288,7 @@ public class SubscriptionNotifier extend
* @throws MalformedURLException
* @throws DispositionReportFaultMessage
*/
- protected void notify(GetSubscriptionResults getSubscriptionResults,
SubscriptionResultsList resultList)
+ protected void notify(GetSubscriptionResults getSubscriptionResults,
SubscriptionResultsList resultList, Date notificationDate)
{
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -295,7 +296,6 @@ public class SubscriptionNotifier extend
org.apache.juddi.model.Subscription modelSubscription =
em.find(org.apache.juddi.model.Subscription.class,
resultList.getSubscription().getSubscriptionKey());
- Date notificationDate = new Date();
//now log to the db that we are sending the
notification.
tx.begin();
modelSubscription.setLastNotified(notificationDate);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
