diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-06-30 22:24:53 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-06-30 22:24:53 +0000 |
| commit | a82ac9325e70af1e8df3f763dea2b60bcfa7f47a (patch) | |
| tree | 82929248e9a797d3fc64b3b3c280f47228595480 /cpp | |
| parent | minor fix to comment (diff) | |
| download | ice-a82ac9325e70af1e8df3f763dea2b60bcfa7f47a.tar.bz2 ice-a82ac9325e70af1e8df3f763dea2b60bcfa7f47a.tar.xz ice-a82ac9325e70af1e8df3f763dea2b60bcfa7f47a.zip | |
renaming MaxProxyLength to ProxyLengthMax
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/PropertyNames.def | 2 | ||||
| -rw-r--r-- | cpp/src/Glacier2/ProxyVerifier.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rwxr-xr-x | cpp/test/Glacier2/addressFilter/run.py | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/cpp/config/PropertyNames.def b/cpp/config/PropertyNames.def index 961936479d1..99d5a627255 100644 --- a/cpp/config/PropertyNames.def +++ b/cpp/config/PropertyNames.def @@ -379,7 +379,7 @@ Glacier2: Client.Trace.Request Filter.Address.Reject Filter.Address.Accept - Filter.MaxProxyLength + Filter.ProxyLengthMax Filter.Category.Accept Filter.AdapterId.Accept Filter.Identity.Accept diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp index 507a87d83c3..69258d49547 100644 --- a/cpp/src/Glacier2/ProxyVerifier.cpp +++ b/cpp/src/Glacier2/ProxyVerifier.cpp @@ -901,12 +901,11 @@ Glacier2::ProxyVerifier::ProxyVerifier(const CommunicatorPtr& communicator, cons Glacier2::parseProperty(communicator, s, _rejectRules, _traceLevel); } - s = communicator->getProperties()->getProperty("Glacier2.Filter.MaxProxyLength"); + s = communicator->getProperties()->getProperty("Glacier2.Filter.ProxyLengthMax"); if(s != "") { _rejectRules.push_back(new MaxEndpointsRule(communicator, s, _traceLevel)); } - } Glacier2::ProxyVerifier::~ProxyVerifier() diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 94e2bb0017e..aee113b62b4 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Jun 27 15:24:35 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Jun 30 14:22:37 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -299,7 +299,7 @@ const char* IceInternal::PropertyNames::Glacier2Props[] = "Glacier2.Client.Trace.Request", "Glacier2.Filter.Address.Reject", "Glacier2.Filter.Address.Accept", - "Glacier2.Filter.MaxProxyLength", + "Glacier2.Filter.ProxyLengthMax", "Glacier2.Filter.Category.Accept", "Glacier2.Filter.AdapterId.Accept", "Glacier2.Filter.Identity.Accept", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index a990ce43ec5..e300fd8e56b 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Jun 27 15:24:35 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Jun 30 14:22:37 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/test/Glacier2/addressFilter/run.py b/cpp/test/Glacier2/addressFilter/run.py index 6ff49a77be6..6b32e4136c7 100755 --- a/cpp/test/Glacier2/addressFilter/run.py +++ b/cpp/test/Glacier2/addressFilter/run.py @@ -275,7 +275,7 @@ for testcase in testcases: if not len(rejectFilter) == 0: routerConfig.write("Glacier2.Filter.Address.Reject=%s\n" % rejectFilter) if not len(maxEndpoints) == 0: - routerConfig.write("Glacier2.Filter.MaxProxyLength=%s\n" % maxEndpoints) + routerConfig.write("Glacier2.Filter.ProxyLengthMax=%s\n" % maxEndpoints) if not len(categoryFilter) == 0: routerConfig.write("Glacier2.Filter.Category.Accept=%s\n" % categoryFilter) if not len(idFilter) == 0: |