gCubeSystem
/
accounting-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #200: Create accouting-lib library 

https://support.d4science.org/issues/200
Fixed FindsBugs resonable warning

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115796 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-07-02 12:32:49 +00:00
parent 3f897db4ff
commit ff86cc3400
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/accounting/aggregation/scheduler/AggregationScheduler.java
View File

@ -26,10 +26,11 @@ public abstract class AggregationScheduler {
protected static AggregationScheduler aggregationScheduler; protected static AggregationScheduler aggregationScheduler;
static {
aggregationScheduler = new BufferAggregationScheduler();
}
public static AggregationScheduler getInstance(){ public static AggregationScheduler getInstance(){
if(aggregationScheduler==null){
aggregationScheduler = new BufferAggregationScheduler();
}
return aggregationScheduler; return aggregationScheduler;
} }

2
src/main/java/org/gcube/accounting/datamodel/BasicUsageRecord.java
View File

@ -483,7 +483,7 @@ public abstract class BasicUsageRecord implements UsageRecord, Serializable {
} }
String classCanonicalName = utilityClass.getCanonicalName(); String classCanonicalName = utilityClass.getCanonicalName();
classCanonicalName.replace(utilityClass.getSimpleName(), usageRecordName); classCanonicalName = classCanonicalName.replace(utilityClass.getSimpleName(), usageRecordName);
try { try {
clz = (Class<? extends UsageRecord>) Class.forName(classCanonicalName); clz = (Class<? extends UsageRecord>) Class.forName(classCanonicalName);

2
src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java
View File

@ -198,7 +198,7 @@ public class RawUsageRecord extends BasicUsageRecord implements SingleUsageRecor
@Deprecated @Deprecated
public void setConsumerId(String consumerId) { public void setConsumerId(String consumerId) {
try{ try{
setConsumerId(consumerId); super.setConsumerId(consumerId);
} catch(Exception e){ } catch(Exception e){
logger.error("Unable to Set {}", CONSUMER_ID); logger.error("Unable to Set {}", CONSUMER_ID);
} }

6
src/main/java/org/gcube/accounting/datamodel/basetypes/JobUsageRecord.java
View File

@ -172,12 +172,14 @@ public abstract class JobUsageRecord extends BasicUsageRecord {
} }
} }
public long getWallDuration() { public long getWallDuration() throws InvalidValueException {
Long wallDuration = (Long) this.resourceProperties.get(WALL_DURATION); Long wallDuration = (Long) this.resourceProperties.get(WALL_DURATION);
if(wallDuration == null){ if(wallDuration == null){
try { try {
wallDuration = calculateWallDuration(); wallDuration = calculateWallDuration();
} catch(Exception e){} } catch(InvalidValueException e){
throw e;
}
} }
return wallDuration; return wallDuration;
} }