projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Fix at suspicion of concurrency problem in surveyingservice

Browse Source
This commit is contained in:
CharonInferar
2014-04-07 01:56:46 +02:00
parent 6e137ab561
commit 31f20c7ac0
1 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SurveyService.java
+46 -43
View File
@@ -86,48 +86,47 @@ public class SurveyService implements INetworkDispatch {
}
public void ServiceProcessing(){
// All tools sampling
SurveyTool removeTool=null;
for (SurveyTool surveyTool : activeSurveyTools){
if (surveyTool.getCurrentlySurveying()){
// Check if survey process has finished
if (System.currentTimeMillis()>surveyTool.getLastSurveyTime()+3000){
removeTool = surveyTool;
surveyTool.setCurrentlySurveying(false);
surveyTool.sendConstructSurveyMapMessage();
synchronized(activeSurveyTools){
// All tools sampling
SurveyTool removeTool=null;
for (SurveyTool surveyTool : activeSurveyTools){
if (surveyTool.getCurrentlySurveying()){
// Check if survey process has finished
if (System.currentTimeMillis()>surveyTool.getLastSurveyTime()+3000){
removeTool = surveyTool;
surveyTool.setCurrentlySurveying(false);
surveyTool.sendConstructSurveyMapMessage();
}
}
if (surveyTool.getCurrentlySampling()){
// Check if sampling process has finished
if ((System.currentTimeMillis()>surveyTool.getLastSampleTime()+3000) && !surveyTool.getCurrentlyCoolingDown()){
surveyTool.setCurrentlyCoolingDown(true);
// Update inventory
handleSamplingStages(surveyTool);
}
// Check if sampling recovery is over
long sampleRecoveryTime = surveyTool.getRecoveryTime();
if (System.currentTimeMillis()>surveyTool.getLastSampleTime()+sampleRecoveryTime && ! surveyTool.isExceptionalState()){
// kick off another sampling attempt
surveyTool.setCurrentlyCoolingDown(false);
continueSampling(surveyTool);
}
if (surveyTool.getUser().getPosture()!=1){
surveyTool.setExceptionalState(false);
surveyTool.setCurrentlySampling(false);
removeTool = surveyTool;
if (surveyTool.getUser().getPosture()==0)
surveyTool.getUser().sendSystemMessage("You stand up", (byte) 0);
surveyTool.getUser().sendSystemMessage("@survey:sample_cancel", (byte) 0);
}
}
}
if (surveyTool.getCurrentlySampling()){
// Check if sampling process has finished
if ((System.currentTimeMillis()>surveyTool.getLastSampleTime()+3000) && !surveyTool.getCurrentlyCoolingDown()){
surveyTool.setCurrentlyCoolingDown(true);
// Update inventory
handleSamplingStages(surveyTool);
}
// Check if sampling recovery is over
long sampleRecoveryTime = surveyTool.getRecoveryTime();
if (System.currentTimeMillis()>surveyTool.getLastSampleTime()+sampleRecoveryTime && ! surveyTool.isExceptionalState()){
// kick off another sampling attempt
surveyTool.setCurrentlyCoolingDown(false);
continueSampling(surveyTool);
}
if (surveyTool.getUser().getPosture()!=1){
surveyTool.setExceptionalState(false);
surveyTool.setCurrentlySampling(false);
removeTool = surveyTool;
if (surveyTool.getUser().getPosture()==0)
surveyTool.getUser().sendSystemMessage("You stand up", (byte) 0);
surveyTool.getUser().sendSystemMessage("@survey:sample_cancel", (byte) 0);
}
}
}
if (removeTool!=null)
activeSurveyTools.remove(removeTool); // remove after notification
if (removeTool!=null)
activeSurveyTools.remove(removeTool); // remove after notification
}
}
public void handleSamplingStages(SurveyTool surveyTool){
@@ -567,8 +566,10 @@ public class SurveyService implements INetworkDispatch {
}
public void addActiveSurveyTool(SurveyTool tool){
if (! activeSurveyTools.contains(tool))
activeSurveyTools.add(tool);
synchronized(activeSurveyTools){
if (! activeSurveyTools.contains(tool))
activeSurveyTools.add(tool);
}
}
public Vector<SurveyTool> getActiveSurveyTools(){
@@ -576,7 +577,9 @@ public class SurveyService implements INetworkDispatch {
}
public void removeActiveSurveyTool(SurveyTool surveyTool){
activeSurveyTools.remove(surveyTool);
synchronized(activeSurveyTools){
activeSurveyTools.remove(surveyTool);
}
}
public boolean toolIsInList(SurveyTool surveyTool){