/*
 * ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 * notice, this list of conditions and the following disclaimer in
 * the documentation and/or other materials provided with the
 * distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 * if any, must include the following acknowledgment:
 * "This product includes software developed by the
 * Apache Software Foundation (http://www.apache.org/)."
 * Alternately, this acknowledgment may appear in the software itself,
 * if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" and
 * "Apache JMeter" must not be used to endorse or promote products
 * derived from this software without prior written permission. For
 * written permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 * "Apache JMeter", nor may "Apache" appear in their name, without
 * prior written permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */
 
package org.apache.jmeter.functions;

import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;

import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;



public class MachineName extends AbstractFunction implements Serializable {

	private static final List desc = new LinkedList();
	private static final String KEY = "__machineName";
	
	static {
//		desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)");
		desc.add(JMeterUtils.getResString("function_name_param"));
	}
	
	private Object[] values;


	public MachineName() {}

	public Object clone() 	{
		return new MachineName();
	}

	public synchronized String execute(SampleResult previousResult, Sampler currentSampler)
			throws InvalidVariableException {

		JMeterVariables vars = getVariables();

//		boolean fullHostName = false;
//		if ( ((CompoundFunction)values[0]).execute().toLowerCase().equals("true") )
//					fullHostName = true;
					
		String varName = ((CompoundVariable)values[values.length - 1]).execute();
		String machineName = "";

		try {
			
			InetAddress Address = InetAddress.getLocalHost();
			
			//fullHostName disabled until we move up to 1.4 as the support jre
//			if ( fullHostName ) {
//				machineName = Address.getCanonicalHostName();

//			} else {
				machineName = Address.getHostName();
//			}
			
		} catch ( UnknownHostException e ) {
		}
		
		vars.put( varName, machineName );
		return machineName;

	}

	public void setParameters(Collection parameters)
			throws InvalidVariableException {

		values = parameters.toArray();
		
		if ( values.length < 2 ) {
			throw new InvalidVariableException();
		}

	}

	public String getReferenceKey() {
		return KEY;
	}

	public List getArgumentDesc() {
		return desc;
	}

}




@@ -3260,16 +3260,128 @@
 ame%22;%0A%09%0A
+%09// Number of parameters expected - used to reject invalid calls%0A%09private static final int PARAMETER_COUNT = 1;%0A
 %09static 
@@ -4599,11 +4599,26 @@
 gth 
-%3C 2
+!= PARAMETER_COUNT
  ) %7B
@@ -4656,16 +4656,53 @@
 ception(
+%22Parameter Count != %22+PARAMETER_COUNT
 );%0A%09%09%7D%0A%0A

Fixing to expect the correct number of parameters.