| | |
| | | { |
| | | ModifyOperation newOp = (ModifyOperation) op; |
| | | dependency = remotePendingChanges.checkDependencies(newOp); |
| | | if (!dependency) |
| | | if ((!dependency) && (!firstTry)) |
| | | { |
| | | done = solveNamingConflict(newOp, msg); |
| | | } |
| | |
| | | AddOperation newOp = (AddOperation) op; |
| | | AddMsg addMsg = (AddMsg) msg; |
| | | dependency = remotePendingChanges.checkDependencies(newOp); |
| | | if (!dependency) |
| | | if ((!dependency) && (!firstTry)) |
| | | { |
| | | done = solveNamingConflict(newOp, addMsg); |
| | | } |
| | |
| | | { |
| | | ModifyDNMsg newMsg = (ModifyDNMsg) msg; |
| | | dependency = remotePendingChanges.checkDependencies(newMsg); |
| | | if (!dependency) |
| | | if ((!dependency) && (!firstTry)) |
| | | { |
| | | ModifyDNOperationBasis newOp = (ModifyDNOperationBasis) op; |
| | | done = solveNamingConflict(newOp, msg); |