Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 13:49:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-15 19:08:46 +02:00
commit fd68be94ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -589,7 +589,7 @@ public abstract class SQLDB extends Database {
if (success) {
commit();
} else {
rollback();
rollback(); // TODO Tests for this case
}
} catch (SQLException e) {
Log.toLog(this.getClass().getName(), e);

4
Plan/test/test/java/main/java/com/djrapitops/plan/PermissionsTest.java
View File

@ -26,7 +26,7 @@ public class PermissionsTest {
*/
@Test
public void testGetPermission() {
assertEquals("plan.inspect.other", Permissions.INSPECT_OTHER.getPermission());
assertEquals("plan.inspect.other", Permissions.INSPECT_OTHER.getPerm());
}
}
}