You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/09/30 06:47:12 UTC
svn commit: r292632 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp:
adapter/WSRPAdapter.java consumer/URLGeneratorImpl.java
Author: antonio
Date: Thu Sep 29 21:47:07 2005
New Revision: 292632
URL: http://svn.apache.org/viewcvs?rev=292632&view=rev
Log:
Fix java 1.3 compatibility.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=292632&r1=292631&r2=292632&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Thu Sep 29 21:47:07 2005
@@ -84,6 +84,7 @@
import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.exception.NestableRuntimeException;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.wsrp4j.consumer.GroupSession;
@@ -860,7 +861,8 @@
} catch (SAXException sae) {
this.getLogger().error("Unable to read wsrp configuration: " + this.wsrpConfigLocation, sae);
} catch (ServiceException se) {
- throw new RuntimeException("Unable to get source resolver.", se);
+ //throw new RuntimeException("Unable to get source resolver.", se);
+ throw new NestableRuntimeException("Unable to get source resolver.", se);
} finally {
if ( resolver != null ) {
resolver.release(source);
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java?rev=292632&r1=292631&r2=292632&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java Thu Sep 29 21:47:07 2005
@@ -119,7 +119,7 @@
final CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
params.put(WSRPEventAspect.REQUEST_PARAMETER_NAME, coplet.getId());
final StringBuffer buffer = new StringBuffer(this.service.getComponentManager().getLinkService().getRefreshLinkURI(secureLink));
- boolean hasParams = buffer.indexOf("?") > 0;
+ boolean hasParams = buffer.toString().indexOf("?") > 0;
Iterator i = params.entrySet().iterator();
while ( i.hasNext() ) {
final Map.Entry entry = (Map.Entry)i.next();