Skip to content

Commit 2d5c1be

Browse files
author
Faisal Hameed
committed
Fixing - squid:S1165:Exception classes should be immutable.
1 parent 5b92fb3 commit 2d5c1be

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

activejdbc/src/main/java/org/javalite/activejdbc/DBException.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,23 @@
2626
*/
2727
public class DBException extends RuntimeException{
2828

29-
String message;
29+
final String message;
3030

3131
public DBException(Throwable cause) {
3232
super(cause);
3333
this.setStackTrace(cause.getStackTrace());
34+
this.message = null;
3435
}
3536

3637
public DBException(String message) {
3738
super(message);
39+
this.message = null;
3840
}
3941

4042
public DBException(String message, Throwable cause) {
4143
super(message, cause);
4244
this.setStackTrace(cause.getStackTrace());
45+
this.message = null;
4346
}
4447

4548

@@ -67,5 +70,6 @@ public String getMessage() {
6770

6871
public DBException() {
6972
super();
73+
this.message = null;
7074
}
7175
}

activejdbc/src/main/java/org/javalite/activejdbc/cache/CacheManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public final void flush(CacheEvent event){
6565
for(CacheEventListener listener: listeners){
6666
try{
6767
listener.onFlush(event);
68-
}catch(Throwable e){
68+
}catch(Exception e){
6969
logger.warn("failed to propagate cache event: {} to listener: {}", event, listener, e);
7070
}
7171
}

activejdbc/src/main/java/org/javalite/activejdbc/validation/ValidationException.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* @author Igor Polevoy
2828
*/
2929
public class ValidationException extends DBException {
30-
private String message = "";
31-
private Model source;
30+
private final String message;
31+
private final Model source;
3232

3333
public ValidationException(Model m){
3434
message = m.errors().toString();
@@ -38,6 +38,7 @@ public ValidationException(Model m){
3838
public ValidationException(String message) {
3939
super(message);
4040
this.message = message;
41+
this.source = null;
4142
}
4243

4344
@Override

db-migrator/src/main/java/org/javalite/db_migrator/MigrationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void migrate(Log log, String encoding) {
7878
versionStrategy.recordMigration(currentMigration.getVersion(), new Date(start), (start - System.currentTimeMillis()));
7979
connection().commit();
8080
}
81-
} catch (Throwable e) {
81+
} catch (Exception e) {
8282
try{connection().rollback();}catch(Exception ex){throw new MigrationException(e);}
8383
assert currentMigration != null;
8484
throw new MigrationException("Migration for version " + currentMigration.getVersion() + " failed, rolling back and terminating migration.", e);

0 commit comments

Comments
 (0)