natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix broken casts. patch by Bill de hOra; reviewed by jbellis for CASSANDRA-338 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802267 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-08-07 23:29:50 +00:00
parent 25dbb8cf85
commit d748648b23
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -683,9 +683,11 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto
{
EndPoint target = new EndPoint(host, DatabaseDescriptor.getStoragePort());
/* Set up the stream manager with the files that need to streamed */
StreamManager.instance(target).addFilesToStream((StreamContextManager.StreamContext[]) streamContexts.toArray());
final StreamContextManager.StreamContext[] contexts = streamContexts.toArray(new StreamContextManager.StreamContext[streamContexts.size()]);
StreamManager.instance(target).addFilesToStream(contexts);
/* Send the bootstrap initiate message */
BootstrapInitiateMessage biMessage = new BootstrapInitiateMessage((StreamContextManager.StreamContext[]) streamContexts.toArray());
final StreamContextManager.StreamContext[] bootContexts = streamContexts.toArray(new StreamContextManager.StreamContext[streamContexts.size()]);
BootstrapInitiateMessage biMessage = new BootstrapInitiateMessage(bootContexts);
Message message = BootstrapInitiateMessage.makeBootstrapInitiateMessage(biMessage);
if (logger_.isDebugEnabled())
logger_.debug("Sending a bootstrap initiate message to " + target + " ...");

56
test/unit/org/apache/cassandra/service/StorageServiceTest.java Normal file
View File

@ -0,0 +1,56 @@
/*
* 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.cassandra.service;
import org.junit.Test;
import org.junit.Assert;
import org.apache.cassandra.net.io.StreamContextManager;
import java.util.List;
import java.util.ArrayList;
public class StorageServiceTest {
@Test
public void testImpossibleCast() {
List<StreamContextManager.StreamContext> streamContexts = new ArrayList<StreamContextManager.StreamContext>();
try {
StreamContextManager.StreamContext[] arr = (StreamContextManager.StreamContext[]) streamContexts.toArray();
Assert.fail("expected ClassCastException from Object[] to StreamContextManager.StreamContext[]");
} catch (ClassCastException e) {
Assert.assertTrue(true);
}
}
@Test
public void testPossibleCast() {
List<StreamContextManager.StreamContext> streamContexts = new ArrayList<StreamContextManager.StreamContext>();
StreamContextManager.StreamContext[] contexts = streamContexts.toArray(new StreamContextManager.StreamContext[streamContexts.size()]);
Assert.assertTrue(contexts.length == 0);
StreamContextManager.StreamContext streamContext = new StreamContextManager.StreamContext("foofile", 0, "fooTable");
streamContexts.add(streamContext);
contexts = streamContexts.toArray(new StreamContextManager.StreamContext[streamContexts.size()]);
Assert.assertTrue(contexts.length == 1);
}
}