Revision: 3929
Author: [email protected]
Date: Fri Aug 27 09:04:16 2010
Log: Changed the name of the local currentRevision variable to jsonRevision
in the run() method of NetworkConflictResolver to avoid duplicate name
confusion.
http://code.google.com/p/power-architect/source/detail?r=3929
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Thu Aug 26 14:41:06 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Fri Aug 27 09:04:16 2010
@@ -371,13 +371,13 @@
JSONObject json = new JSONObject(message.getBody());
final JSONTokener tokener = new
JSONTokener(json.getString("data"));
- final int currentRevision =
json.getInt("currentRevision");
+ final int jsonRevision = json.getInt("currentRevision");
session.runInForeground(new Runnable() {
public void run() {
try {
if (!postingJSON.get()) {
- decodeMessage(tokener, currentRevision);
+ decodeMessage(tokener, jsonRevision);
}
} catch (AccessDeniedException e) {
interrupt();
