svn commit: [jahia] r18643 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/HttpRequestWrapper.java

[tdraier]

Author: tdraier
Date: Tue Sep 25 16:21:31 2007
New Revision: 18643

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18643&repname=
=3Djahia
Log:
always check http authentication first ( ATOS-62 )

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/Ht=
tpRequestWrapper.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/web=
dav/HttpRequestWrapper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/webdav/HttpRequestWrapper.java&rev=
=3D18643&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/Ht=
tpRequestWrapper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/Ht=
tpRequestWrapper.java Tue Sep 25 16:21:31 2007
@@ -295,13 +295,13 @@
     }
                 =

     public Principal getUserPrincipal() {
-        Principal user =3D getJahiaUserPrincipal();
+        Principal user =3D getHttpUserPrincipal();
         if (user =3D=3D null) {
             user =3D getNtlmUserPrincipal();
         }
         if (user =3D=3D null) {
-            user =3D getHttpUserPrincipal();
-        }                       =

+            user =3D getJahiaUserPrincipal();
+        }
         if (user =3D=3D null) {
             user =3D (Principal) getSession(true).getAttribute("webdavUser=
Wrapper");
         }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list