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 jm...@apache.org on 2005/04/11 23:13:12 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/util ParameterChecker.java
jmacna 2005/04/11 14:13:12
Modified: src/org/apache/wsrp4j/util ParameterChecker.java
Log:
Fixes WSRP4J-52 : serviceDescriptionResponse never gets checked.
Revision Changes Path
1.5 +21 -29 ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java
Index: ParameterChecker.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/ParameterChecker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParameterChecker.java 1 Jun 2004 13:42:46 -0000 1.4
+++ ParameterChecker.java 11 Apr 2005 21:13:12 -0000 1.5
@@ -515,47 +515,39 @@
*/
public void check(ServiceDescription response) throws MissingParametersFault
{
- if (isCheckEnabled())
- {
- // check ServiceDescription object pointer
- if (response instanceof ServiceDescription)
- {
+ if (isCheckEnabled()) {
+ if (response != null) {
+ // check ServiceDescription object pointer
+ if (response instanceof ServiceDescription) {
- if (response != null)
- {
+ if (response.getOfferedPortlets() != null) {
- } else if (response.getOfferedPortlets() != null)
- {
+ PortletDescription[] portletDesc = response.getOfferedPortlets();
- PortletDescription[] portletDesc = response.getOfferedPortlets();
+ for (int i = 0; i < portletDesc.length; i++) {
- for (int i = 0; i < portletDesc.length; i++)
- {
+ check(portletDesc[i]);
+ }
- check(portletDesc[i]);
- }
+ } else if (response.getRequiresInitCookie() != null) {
- } else if (response.getRequiresInitCookie() != null)
- {
+ check(response.getRequiresInitCookie(), true);
- check(response.getRequiresInitCookie(), true);
+ } else if (response.getResourceList() != null) {
- } else if (response.getResourceList() != null)
- {
+ check(response.getResourceList(), true);
- check(response.getResourceList(), true);
+ }
+ } else {
- } else
- {
+ throwMissingParametersFault("No valid service description.");
+ }
- throwMissingParametersFault("No valid service description.");
- }
- } else
- {
+ } else {
- throwMissingParametersFault("No valid service description response found.");
- }
- }
+ throwMissingParametersFault("No valid service description response found.");
+ }
+ }
}
/**