[zanata-commits] [zanata/zanata] 883ad8: fix the NullPointerException

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/zanata/zanata

Commit: 883ad8c28dbaa0662b7d759e59bc3c0306957e47
    https://github.com/zanata/zanata/commit/883ad8c28dbaa0662b7d759e59bc3c0306957e47
Author: hding <hding at redhat.com>
Date:   2011-05-04 (Wed, 04 May 2011)

Changed paths:
  M server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java

Log Message:
-----------
fix the NullPointerException 


Commit: c6e0adb72167d57eb765137d7eb86b78fa3d99e3
    https://github.com/zanata/zanata/commit/c6e0adb72167d57eb765137d7eb86b78fa3d99e3
Author: hding <hding at redhat.com>
Date:   2011-05-04 (Wed, 04 May 2011)

Changed paths:
  M server/zanata-model/src/main/resources/META-INF/persistence.xml
  M server/zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
  M server/zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
  M server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
  M zanata-parent/pom.xml

Log Message:
-----------
Merge branch 'master' of https://github.com/zanata/zanata

Conflicts:
	server/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java


Compare: https://github.com/zanata/zanata/compare/0fa394d...c6e0adb