Skip to content

Commit

Permalink
Miscellaneous Fixes
Browse files Browse the repository at this point in the history
* TeiidServerEditor
 * Avoid executing runnable if form has already been disposed

* ExecutionAdmin
 * pingJDBC should not call admin.deploy but adminSpec.deploy since the
   deploy method changed names between Teiid 7.7 and 8.0
  • Loading branch information
Paul Richardson committed Aug 6, 2014
1 parent bbdeaf4 commit e00652d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
package org.teiid.designer.runtime.ui.server.editor;

import static org.teiid.designer.runtime.ui.DqpUiConstants.UTIL;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Properties;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.layout.GridDataFactory;
Expand Down Expand Up @@ -278,6 +276,9 @@ public void manageLoad(Properties args) {
public void run() {
progressBar.dispose();

if (form.getBody().isDisposed())
return;

contentsPanel = toolkit.createComposite(form.getBody());
GridLayoutFactory.fillDefaults().numColumns(1).spacing(10, 0).applyTo(contentsPanel);
GridDataFactory.fillDefaults().grab(true, true).applyTo(contentsPanel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
Expand All @@ -50,10 +49,10 @@
import org.teiid.designer.runtime.spi.ITeiidJdbcInfo;
import org.teiid.designer.runtime.spi.ITeiidServer;
import org.teiid.designer.runtime.spi.ITeiidTranslator;
import org.teiid.designer.runtime.spi.ITeiidTranslator.TranslatorPropertyType;
import org.teiid.designer.runtime.spi.ITeiidVdb;
import org.teiid.designer.runtime.spi.TeiidExecutionException;
import org.teiid.designer.runtime.spi.TeiidPropertyDefinition;
import org.teiid.designer.runtime.spi.ITeiidTranslator.TranslatorPropertyType;
import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
import org.teiid.jdbc.TeiidDriver;
Expand Down Expand Up @@ -884,8 +883,7 @@ private IStatus pingJdbc() {
String url = "jdbc:teiid:ping@" + protocol + host + ':' + teiidJdbcInfo.getPort(); //$NON-NLS-1$

try {

admin.deploy(PING_VDB, new ByteArrayInputStream(adminSpec.getTestVDB().getBytes()));
adminSpec.deploy(admin, PING_VDB, new ByteArrayInputStream(adminSpec.getTestVDB().getBytes()));

try{
String urlAndCredentials = url + ";user=" + teiidJdbcInfo.getUsername() + ";password=" + teiidJdbcInfo.getPassword() + ';'; //$NON-NLS-1$ //$NON-NLS-2$
Expand Down

0 comments on commit e00652d

Please sign in to comment.