Merge branch 'master' into 1.3

zanata · May 5, 2011 · 5ec712e · 5ec712e
2 parents 2638a99 + 0fa394d
commit 5ec712e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java b/server/zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
@@ -136,7 +136,7 @@ protected String authRequest(String userSuppliedString, String returnToUrl)
       }
       catch (OpenIDException e)
       {
-         log.warn(e);
+         log.warn(e, e);
       }
 
       return null;
@@ -209,7 +209,7 @@ public String verifyResponse(HttpServletRequest httpReq)
       }
       catch (OpenIDException e)
       {
-         log.warn(e);
+         log.warn(e, e);
       }
 
       return null;

diff --git a/server/zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java b/server/zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
@@ -58,7 +58,7 @@ public void beforePhase(PhaseEvent event)
          }
          catch (IOException e)
          {
-            log.warn(e);
+            log.warn(e, e);
          }
          return;
       }

diff --git a/server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java b/server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
@@ -87,7 +87,7 @@ public void setCredential()
       }
       catch (Exception e)
       {
-         log.info(e.getMessage());
+         log.warn(e, e);
       }
    }
 }