Merge branch 'master' into target-env

wyona · Jun 25, 2012 · 05e2469 · 05e2469
2 parents 7afea64 + e69bb17
commit 05e2469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/contributions/resources/yanel-user/src/build/build.properties b/src/contributions/resources/yanel-user/src/build/build.properties
@@ -1,5 +1,6 @@
 resource.name=yanel-user
-resource.version=2.3.0
+resource.version=3.0.0
+# 3.0.0: updateProfile(String) can throw an exception, which means derived classes might have to catch this exception
 # 2.3.0: Private method updatePassword() set to protected, such that one can call it inside classes which extend org.wyona.yanel.impl.resources.yaneluser.EditYanelUserProfileResource
 # 2.2.0: Private method getUserId() set to protected, such that one can call it inside classes which extend org.wyona.yanel.impl.resources.yaneluser.EditYanelUserProfileResource
 # 2.1.0: Protected method getUserProfile(String, boolean) introduced, such that one can overwrite the document generation

diff --git a/...-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java b/...-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java
@@ -201,7 +201,7 @@ protected void updatePassword(String oldPassword, String newPassword, String new
      * @param email New email address of user (and possibly also alias)
      * @return true if update was successful and false otherwise
      */
-    protected boolean updateProfile(String email) {
+    protected boolean updateProfile(String email) throws Exception {
         if (email == null || ("").equals(email)) {
             setTransformerParameter("error", "emailNotSet");
             log.warn("No email (or empty email) specified, hence do not update email address!");