diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-07-29 13:25:18 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-07-29 13:25:18 +0000 |
| commit | 108392d24201b5ad52c94ec35a802cf632d94805 (patch) | |
| tree | 351bfff561240fe2997bb31406accecb2f069c5d /cpp/src/IceGrid/Parser.cpp | |
| parent | Removed extra space from warning and error (diff) | |
| download | ice-108392d24201b5ad52c94ec35a802cf632d94805.tar.bz2 ice-108392d24201b5ad52c94ec35a802cf632d94805.tar.xz ice-108392d24201b5ad52c94ec35a802cf632d94805.zip | |
Bug fixes
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 238c2e1b6a8..37354769302 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -254,9 +254,6 @@ Parser::diffApplication(const list<string>& args) return; } - ApplicationDescriptor newApp; - ApplicationDescriptor origApp; - try { StringSeq targets; @@ -278,8 +275,15 @@ Parser::diffApplication(const list<string>& args) } } - newApp = DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator); - origApp = _admin->getApplicationDescriptor(newApp.name); + ApplicationDescriptor newApp = DescriptorParser::parseDescriptor(descriptor, targets, vars, _communicator); + ApplicationDescriptor origApp = _admin->getApplicationDescriptor(newApp.name); + + ApplicationHelper newAppHelper(newApp); + ApplicationHelper oldAppHelper(origApp); + + Output out(cout); + newAppHelper.printDiff(out, oldAppHelper); + out << nl; } catch(const DeploymentException& ex) { @@ -295,13 +299,6 @@ Parser::diffApplication(const list<string>& args) error(s.str()); return; } - - ApplicationHelper newAppHelper(newApp); - ApplicationHelper oldAppHelper(origApp); - - Output out(cout); - newAppHelper.printDiff(out, oldAppHelper); - out << nl; } void |