From ac5e30ffbe1c3cf8fc7f338a94cf9e1917260f47 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 7 Nov 2010 11:52:52 +0100 Subject: [PATCH] fix password issue in UserResource --- .../java/sonia/scm/api/rest/resources/UserResource.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java index 472b8523b7..e655957872 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java @@ -40,6 +40,7 @@ import com.google.inject.Singleton; import sonia.scm.user.User; import sonia.scm.user.UserManager; +import sonia.scm.util.AssertUtil; import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ @@ -122,6 +123,14 @@ public class UserResource extends AbstractResource @Override protected void updateItem(String name, User user) throws Exception { + if (DUMMY_PASSWORT.equals(user.getPassword())) + { + User o = userManager.get(name); + + AssertUtil.assertIsNotNull(o); + user.setPassword(o.getPassword()); + } + userManager.modify(user); }