[patch] Patch for fixing this.

IncludeController.java (text/plain), 7.79 KB, created by vh.garcia.valencia on 2011-09-22 15:35:47 UTC

(hide)

Description: Patch for fixing this.

Filename:

MIME Type:

Creator: vh.garcia.valencia

Created: 2011-09-22 15:35:47 UTC

Size: 7.79 KB

patch

obsolete

>/* > * Licensed to the Apache Software Foundation (ASF) under one or more > * contributor license agreements. See the NOTICE file distributed with > * this work for additional information regarding copyright ownership. > * The ASF licenses this file to You under the Apache License, Version 2.0 > * (the "License"); you may not use this file except in compliance with > * the License. You may obtain a copy of the License at > * > * http://www.apache.org/licenses/LICENSE-2.0 > * > * Unless required by applicable law or agreed to in writing, software > * distributed under the License is distributed on an "AS IS" BASIS, > * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > * See the License for the specific language governing permissions and > * limitations under the License. > * > */ > >package org.apache.jmeter.control; > >import java.io.File; >import java.io.FileInputStream; >import java.io.FileNotFoundException; >import java.io.IOException; >import java.io.InputStream; >import java.util.Iterator; >import java.util.LinkedList; > >import org.apache.jmeter.testelement.TestPlan; >import org.apache.jmeter.control.TestFragmentController; > >import org.apache.jmeter.gui.tree.JMeterTreeNode; >import org.apache.jmeter.save.SaveService; >import org.apache.jmeter.services.FileServer; >import org.apache.jmeter.testelement.TestElement; >import org.apache.jmeter.util.JMeterUtils; >import org.apache.jorphan.collections.HashTree; >import org.apache.jorphan.logging.LoggingManager; >import org.apache.jorphan.util.JOrphanUtils; >import org.apache.log.Logger; > >public class IncludeController extends GenericController implements ReplaceableController { > private static final Logger log = LoggingManager.getLoggerForClass(); > > private static final long serialVersionUID = 240L; > > private static final String INCLUDE_PATH = "IncludeController.includepath"; //$NON-NLS-1$ > > private static final String prefix = > JMeterUtils.getPropDefault( > "includecontroller.prefix", //$NON-NLS-1$ > ""); //$NON-NLS-1$ > > private HashTree SUBTREE = null; > private TestElement SUB = null; > > /** > * No-arg constructor > * > * @see java.lang.Object#Object() > */ > public IncludeController() { > super(); > } > > @Override > public Object clone() { > // TODO - fix so that this is only called once per test, instead of at every clone > // Perhaps save previous filename, and only load if it has changed? > this.resolveReplacementSubTree(null); > IncludeController clone = (IncludeController) super.clone(); > clone.setIncludePath(this.getIncludePath()); > if (this.SUBTREE != null) { > if (this.SUBTREE.keySet().size() == 1) { > Iterator<Object> itr = this.SUBTREE.keySet().iterator(); > while (itr.hasNext()) { > this.SUB = (TestElement) itr.next(); > } > } > clone.SUBTREE = (HashTree)this.SUBTREE.clone(); > > clone.SUB = this.SUB==null? null: (TestElement)this.SUB.clone(); > } > return clone; > } > > /** > * In the event an user wants to include an external JMX test plan > * the GUI would call this. > * @param jmxfile > */ > public void setIncludePath(String jmxfile) { > this.setProperty(INCLUDE_PATH,jmxfile); > } > > /** > * return the JMX file path. > * @return the JMX file path > */ > public String getIncludePath() { > return this.getPropertyAsString(INCLUDE_PATH); > } > > /** > * The way ReplaceableController works is clone is called first, > * followed by replace(HashTree) and finally getReplacement(). > */ > public HashTree getReplacementSubTree() { > return SUBTREE; > } > > public TestElement getReplacementElement() { > return SUB; > } > > public void resolveReplacementSubTree(JMeterTreeNode context) { > this.SUBTREE = this.loadIncludedElements(); > } > > /** > * load the included elements using SaveService > */ > protected HashTree loadIncludedElements() { > // only try to load the JMX test plan if there is one > final String includePath = getIncludePath(); > InputStream reader = null; > HashTree tree = null; > if (includePath != null && includePath.length() > 0) { > try { > String fileName=prefix+includePath; > File file = new File(fileName); > final String absolutePath = file.getAbsolutePath(); > log.info("loadIncludedElements -- try to load included module: "+absolutePath); > if(!file.exists() && !file.isAbsolute()){ > log.info("loadIncludedElements -failed for: "+absolutePath); > file = new File(FileServer.getFileServer().getBaseDir(), includePath); > log.info("loadIncludedElements -Attempting to read it from: "+absolutePath); > if(!file.exists()){ > log.error("loadIncludedElements -failed for: "+absolutePath); > throw new IOException("loadIncludedElements -failed for: "+absolutePath); > } > } > > reader = new FileInputStream(file); > tree = SaveService.loadTree(reader); > // filter the tree for a TestFragment. > tree = getProperBranch(tree); > removeDisabledItems(tree); > return tree; > } catch (NoClassDefFoundError ex) // Allow for missing optional jars > { > String msg = ex.getMessage(); > if (msg == null) { > msg = "Missing jar file - see log for details"; > } > log.warn("Missing jar file", ex); > JMeterUtils.reportErrorToUser(msg); > } catch (FileNotFoundException ex) { > String msg = ex.getMessage(); > JMeterUtils.reportErrorToUser(msg); > log.warn(msg); > } catch (Exception ex) { > String msg = ex.getMessage(); > if (msg == null) { > msg = "Unexpected error - see log for details"; > } > JMeterUtils.reportErrorToUser(msg); > log.warn("Unexpected error", ex); > } > finally{ > JOrphanUtils.closeQuietly(reader); > } > } > return tree; > } > > private HashTree getProperBranch(HashTree tree) { > Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator(); > while (iter.hasNext()) { > TestElement item = (TestElement) iter.next(); > > //if we found a TestPlan, then we are on our way to the TestFragment > if (item instanceof TestPlan) > { > return getProperBranch(tree.getTree(item)); > } > > if (item instanceof TestFragmentController) > { > return tree.getTree(item); > } > } > //return the tree since we didn't find a TestFragment. This will mimic the > //old behavior to import an exact node. > return tree; > } > > > private void removeDisabledItems(HashTree tree) { > Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator(); > while (iter.hasNext()) { > TestElement item = (TestElement) iter.next(); > if (!item.isEnabled()) { > //log.info("Removing "+item.toString()); > tree.remove(item); > } else { > //log.info("Keeping "+item.toString()); > removeDisabledItems(tree.getTree(item));// Recursive call > } > } > } > >} View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]