Hi Janaka,

Looks good. Apart from this, we should probably check how other
notification related aspects need to be fixed to facilitate the mounted
scenarios.

Thanks,
Senaka.

On Thu, Jul 12, 2012 at 7:36 PM, <[email protected]> wrote:

> Author: ajithn
> Date: Thu Jul 12 10:06:02 2012
> New Revision: 132782
> URL: http://wso2.org/svn/browse/wso2?view=rev&revision=132782
>
> Log:
> Apply the patch for REGISTRY-1081 provider-janaka
>
> Modified:
>
>  
> carbon/platform/trunk/components/registry/org.wso2.carbon.registry.info.ui/src/main/resources/web/info/subscription.jsp
>
> Modified:
> carbon/platform/trunk/components/registry/org.wso2.carbon.registry.info.ui/src/main/resources/web/info/subscription.jsp
> URL:
> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/components/registry/org.wso2.carbon.registry.info.ui/src/main/resources/web/info/subscription.jsp?rev=132782&r1=132781&r2=132782&view=diff
>
> ==============================================================================
> ---
> carbon/platform/trunk/components/registry/org.wso2.carbon.registry.info.ui/src/main/resources/web/info/subscription.jsp
>     (original)
> +++
> carbon/platform/trunk/components/registry/org.wso2.carbon.registry.info.ui/src/main/resources/web/info/subscription.jsp
>     Thu Jul 12 10:06:02 2012
> @@ -32,27 +32,30 @@
>  <script type="text/javascript" src="../ajax/js/prototype.js"></script>
>
>  <%
> -    SubscriptionInstance[] subscriptions = null;
> +    SubscriptionInstance[] subscriptions = new SubscriptionInstance[0];
>      String cookie = (String)
> session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
>      InfoServiceClient client = new InfoServiceClient(cookie, config,
> session);
>  %>
>  <fmt:bundle basename="org.wso2.carbon.registry.info.ui.i18n.Resources">
>
>  <%
> -if (request.getParameter("path") != null) {
> -    try{
> -        SubscriptionBean subscriptionBean =
> client.getSubscriptions(request);
> -        subscriptions = subscriptionBean.getSubscriptionInstances();
> +    if (request.getParameter("path") != null) {
> +        try {
> +            String url = client.getRemoteURL(request);
> +            if (url == null) {
> +                SubscriptionBean subscriptionBean =
> client.getSubscriptions(request);
> +                subscriptions =
> subscriptionBean.getSubscriptionInstances();
> +            }
>
> -}catch(Exception e){
> -    response.setStatus(500);
> -    CarbonUIMessage uiMsg = new CarbonUIMessage(CarbonUIMessage.ERROR,
> e.getMessage(), e);
> -    session.setAttribute(CarbonUIMessage.ID, uiMsg);
> +        } catch (Exception e) {
> +            response.setStatus(500);
> +            CarbonUIMessage uiMsg = new
> CarbonUIMessage(CarbonUIMessage.ERROR, e.getMessage(), e);
> +            session.setAttribute(CarbonUIMessage.ID, uiMsg);
>  %>
>      <jsp:include page="../admin/error.jsp?<%=e.getMessage()%>"/>
>      <%
> -                return;
> -    }
> +            return;
> +        }
>  %>
>      <div class="box1-head" style="height:auto;">
>             <table cellspacing="0" cellpadding="0" border="0"
> style="width:100%">
> _______________________________________________
> Commits mailing list
> [email protected]
> http://wso2.org/cgi-bin/mailman/listinfo/commits
>



-- 
*Senaka Fernando*
Member - Integration Technologies Management Committee;
Technical Lead; WSO2 Inc.; http://wso2.com*
Member; Apache Software Foundation; http://apache.org

E-mail: senaka AT wso2.com
**P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818
Linked-In: http://linkedin.com/in/senakafernando

*Lean . Enterprise . Middleware
_______________________________________________
Dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/dev

Reply via email to