Skip to content

Commit

Permalink
TEIIDES-2139 addendum
Browse files Browse the repository at this point in the history
* Fixes password change failure when the admin password is modified in the
  Teiid Server Editor. Only applies to a version 7.7 server since 8+ uses
  the admin password of the parent jboss server.
  • Loading branch information
Paul Richardson committed Aug 6, 2014
1 parent 434f49c commit aad96ae
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.teiid.designer.runtime.adapter.TeiidServerAdapterFactory;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidServerManager;
import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;

/**
* Singleton listener for monitoring both the {@link IServer}s'
Expand Down Expand Up @@ -77,8 +78,14 @@ public void serverChanged(IServer server) {
* and references in editor will thus hang on to the old defunct version.
*
* Only update the settings which may have been queried from the server.
*
* The admin settings were changed in version 8+ to use the admin connection
* of the jboss parent server. Thus, version 7 should not try and change these
* while version 8+ should.
*/
teiidServer.getTeiidAdminInfo().setAll(newTeiidServer.getTeiidAdminInfo());
if (teiidServer.getServerVersion().isGreaterThan(Version.TEIID_7_7.get())) {
teiidServer.getTeiidAdminInfo().setAll(newTeiidServer.getTeiidAdminInfo());
}
teiidServer.getTeiidJdbcInfo().setPort(newTeiidServer.getTeiidJdbcInfo().getPort());

teiidServer.notifyRefresh();
Expand Down

0 comments on commit aad96ae

Please sign in to comment.