aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorDemian <demianalonso@gmail.com>2015-06-09 19:45:22 -0300
committerDemian <demianalonso@gmail.com>2015-06-09 19:45:22 -0300
commit62048ed5ec8054c9e0205f3308d0954926746866 (patch)
tree7509b27aa1ea027a8deaca38b373195b723eb824 /src/org
parentc4f3d8958caf55f99e383553980d8c2eea968243 (diff)
downloadtrackermap-server-62048ed5ec8054c9e0205f3308d0954926746866.tar.gz
trackermap-server-62048ed5ec8054c9e0205f3308d0954926746866.tar.bz2
trackermap-server-62048ed5ec8054c9e0205f3308d0954926746866.zip
Replaced tabs for spaces
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/database/DataManager.java6
-rw-r--r--src/org/traccar/model/User.java22
2 files changed, 14 insertions, 14 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 7ded88d15..fdab359f4 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -240,9 +240,9 @@ public class DataManager {
.executeUpdate();
if(user.getPassword() != null) {
- QueryBuilder.create(dataSource, properties.getProperty("database.updateUserPassword"))
- .setObject(user)
- .executeUpdate();
+ QueryBuilder.create(dataSource, properties.getProperty("database.updateUserPassword"))
+ .setObject(user)
+ .executeUpdate();
}
}
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 70a4498f5..9186e66c5 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -64,16 +64,16 @@ public class User implements Factory {
public static byte[] sha256(String text) {
- try {
- MessageDigest md = MessageDigest.getInstance("SHA-256");
+ try {
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
- md.update(text.getBytes("UTF-8"));
- byte[] digest = md.digest();
- return digest;
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
+ md.update(text.getBytes("UTF-8"));
+ byte[] digest = md.digest();
+ return digest;
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
}