You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/12/23 19:42:55 UTC
svn commit: r489915 - in
/portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer:
driver/ConsumerRegistryImpl.java
provider/driver/PortletRegistrationFilterImpl.java
Author: dlouzan
Date: Sat Dec 23 10:42:54 2006
New Revision: 489915
URL: http://svn.apache.org/viewvc?view=rev&rev=489915
Log:
Modified operations according to interface modifications in revision 489913
Modified:
portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/driver/ConsumerRegistryImpl.java
portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/PortletRegistrationFilterImpl.java
Modified: portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/driver/ConsumerRegistryImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/driver/ConsumerRegistryImpl.java?view=diff&rev=489915&r1=489914&r2=489915
==============================================================================
--- portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/driver/ConsumerRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/driver/ConsumerRegistryImpl.java Sat Dec 23 10:42:54 2006
@@ -255,14 +255,21 @@
log.debug(Utility.strEnter(MN));
}
- persistentDataObject.clear();
- persistentDataObject.addObject(registrations.get(regHandle));
- delete(persistentDataObject);
- registrations.remove(regHandle);
-
- if (log.isDebugEnabled()) {
- log.debug("Consumer with registration handle: " +
- regHandle + " is now registered.");
+ try {
+ persistentDataObject.clear();
+ persistentDataObject.addObject(registrations.get(regHandle));
+ delete(persistentDataObject);
+ registrations.remove(regHandle);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Consumer with registration handle: " +
+ regHandle + " is now deregistered.");
+ }
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while deregistering consumer with " +
+ "handle: " + regHandle, e);
+ }
}
if (log.isDebugEnabled()) {
@@ -371,7 +378,8 @@
*
* @param persistentDataObject
*/
- private void delete(PersistentDataObject persistentDataObject) {
+ private void delete(PersistentDataObject persistentDataObject)
+ throws WSRPException {
String MN = "delete";
Modified: portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/PortletRegistrationFilterImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/PortletRegistrationFilterImpl.java?view=diff&rev=489915&r1=489914&r2=489915
==============================================================================
--- portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/PortletRegistrationFilterImpl.java (original)
+++ portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/provider/driver/PortletRegistrationFilterImpl.java Sat Dec 23 10:42:54 2006
@@ -301,7 +301,13 @@
persistentDataObject.getPersistentInformation().
setGroupID(regHandle);
consumerPortletRegistrationMap.remove(regHandle);
- delete(persistentDataObject);
+ try {
+ delete(persistentDataObject);
+ } catch (WSRPException e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error while removing a portlet registration", e);
+ }
+ }
}
if (log.isDebugEnabled()) {
@@ -392,7 +398,8 @@
*
* @param persistentDataObject
*/
- private void delete(PersistentDataObject persistentDataObject) {
+ private void delete(PersistentDataObject persistentDataObject)
+ throws WSRPException {
String MN = "delete";
if (log.isDebugEnabled()) {