Author: tdraier
Date: Mon Jun 25 14:26:52 2007
New Revision: 17737
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17737&repname=
=3Djahia
Log:
fix when page not found ( backport 17281 )
Modified:
trunk/core/src/java/org/jahia/params/valves/CasAuthValveImpl.java
Modified: trunk/core/src/java/org/jahia/params/valves/CasAuthValveImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/valves/CasAuthValveImpl.java&rev=3D17737&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/params/valves/CasAuthValveImpl.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/params/valves/CasAuthValveImpl.java Mon J=
un 25 14:26:52 2007
@@ -85,10 +85,22 @@
return casService.getServerLoginUrl() + "?service=3D" + redirectUr=
l;
}
=
+
private String getServiceUrl(ProcessingContext processingContext) {
int pid =3D processingContext.getPageID();
+ if (pid =3D=3D -1) {
+ logger.warn("pid is -1");
+ String spid =3D processingContext.getParameter("pid");
+ try {
+ pid =3D Integer.parseInt(spid);
+ logger.debug("pid parameter =3D "+pid);
+ } catch (NumberFormatException e) {
+ }
+ logger.debug("contentpage =3D "+processingContext.getContentPa=
ge());
+ logger.debug("homecontentpage =3D "+processingContext.getSite(=
).getHomeContentPage());
+ }
=
-
+ logger.debug("get serviceUrl, pid =3D "+pid );
final String siteServerName =3D processingContext.getSite().getSer=
verName();
=
final StringBuffer redirectUrl =3D new StringBuffer(processingCont=
ext.getScheme() + "://");
@@ -103,9 +115,10 @@
redirectUrl.append(Jahia.getServletPath());
=
if (pid !=3D -1) {
- redirectUrl.append(processingContext.getPageURLPart(pid));
+ String pageURLPart =3D processingContext.getPageURLPart(pid);
+ logger.debug("pageURLpart =3D "+pageURLPart );
+ redirectUrl.append(pageURLPart);
}
return redirectUrl.toString();
}
-
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
